Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/delivery/plan/index.vue

@@ -54,7 +54,15 @@
                   <span>{{ row.createBy }}({{ parseTime(row.updateTime, '{y}-{m}-{d}') }})</span>
                 </div>
                 <div class="content-item">
-                  <span class="label">备注：</span>
+                  <span class="label">
+                    <el-tooltip v-if="row.orderId" :content="'已绑定订单：' + row.orderId">
+                      <el-icon class="el-icon-paperclip"></el-icon>
+                    </el-tooltip>
+                    备注：
+                  </span>
+                  <span>
+                    
+                  </span>
                   <span>{{ row.remark || '-' }}</span>
                 </div>
               </div>
@@ -118,6 +126,9 @@
             placeholder="请选择计划日期">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="绑定订单" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单号" />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -175,6 +186,8 @@ export default {
       form: {
         planName: '',
         planDate: '',
+        orderId: '',
+        remark: '',
       },
       // 表单校验
       rules: {},
@@ -320,7 +333,8 @@ export default {
         createTime: undefined,
         createBy: undefined,
         updateTime: undefined,
-        updateBy: undefined
+        updateBy: undefined,
+        orderId: undefined,
       };
       this.resetForm("form");
     },

klp-ui/src/views/wms/receive/detail/index.vue

@@ -79,6 +79,7 @@
             <el-table-column label="操作状态" align="center" prop="actionStatus" width="120">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.actionStatus === 2" type="success">已收货</el-tag>
+                <el-tag v-else-if="scope.row.actionStatus === 3" type="danger">已取消</el-tag>
                 <el-tag v-else type="primary">未收货</el-tag>
               </template>
             </el-table-column>
@@ -87,7 +88,7 @@
                 <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="primary"
                   @click="openReceiptModal(scope.row)">签收</el-button>
                   <el-button v-if="scope.row.actionStatus == 0 || scope.row.actionStatus == 1" type="danger"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleReject(scope.row)">拒签</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -262,6 +263,21 @@ export default {
       this.open = false;
       this.reset();
     },
+    handleReject(row) {
+      this.$modal.confirm("确认拒签吗？", "拒签确认", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        updatePendingAction({
+          ...row,
+          actionStatus: 3, // 3表示拒签
+        }).then(response => {
+          this.$modal.msgSuccess("拒签成功");
+          this.getList();
+        });
+      });
+    },
     // 表单重置
     reset() {
       this.form = {