fix:联调出入库问题处理

wms_pro/qd/src/components/Crud/crud.js

@@ -357,13 +357,13 @@ function CRUD(options) {
       crud.status.edit = CRUD.STATUS.PROCESSING
       crud.crudMethod.edit(crud.form).then(() => {
         crud.status.edit = CRUD.STATUS.NORMAL
-        crud.getDataStatus(crud.getDataId(crud.form)).edit = CRUD.STATUS.NORMAL
+        // crud.getDataStatus(crud.getDataId(crud.form)).edit = CRUD.STATUS.NORMAL
         crud.editSuccessNotify()
         crud.resetForm()
         callVmHook(crud, CRUD.HOOK.afterSubmit)
         crud.refresh()
-      }).catch(() => {
-        crud.status.edit = CRUD.STATUS.PREPARED
+      }).catch(err => {
+        crud.status.edit = CRUD.STATUS.NORMAL
         callVmHook(crud, CRUD.HOOK.afterEditError)
       })
     },

wms_pro/qd/src/views/wms/dispatch_manage/point/index.vue

@@ -143,7 +143,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="是否启用" prop="is_used">
-            <el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
+            <el-switch v-model="form.is_used" :active-value=true :inactive-value=false />
           </el-form-item>
           <el-form-item v-show="pointTypesDialogList.length > 0" label="点位类型" prop="device_point_type">
             <el-select
@@ -269,7 +269,7 @@ export default {
     return CRUD({
       title: '点位',
       url: 'api/point',
-      idField: 'point_id',
+      idField: 'id',
       optShow: {
         add: true,
         edit: true,

wms_pro/qd/src/views/wms/dispatch_manage/task/index.vue

@@ -139,6 +139,11 @@
             {{ statusEnum.label.TASK_TYPE[scope.row.task_type] }}
           </template>
         </el-table-column>
+        <el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow label="载具编码">
+          <template slot-scope="scope">
+            {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
+          </template>
+        </el-table-column>
         <el-table-column prop="acs_type" show-overflow-tooltip show-tooltip-when-overflow width="130" label="ACS任务类型"/>
         <el-table-column prop="status" show-overflow-tooltip show-tooltip-when-overflow label="任务状态">
           <template slot-scope="scope">
@@ -151,11 +156,7 @@
         <el-table-column prop="point_code2" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点1"/>
         <el-table-column prop="point_code3" show-overflow-tooltip show-tooltip-when-overflow width="130" label="起点2"/>
         <el-table-column prop="point_code4" show-overflow-tooltip show-tooltip-when-overflow width="130" label="终点2"/>
-        <el-table-column prop="vehicle_code" show-overflow-tooltip show-tooltip-when-overflow label="载具编码">
-          <template slot-scope="scope">
-            {{ scope.row.vehicle_code ? scope.row.vehicle_code : '-' }}
-          </template>
-        </el-table-column>
+
         <el-table-column prop="priority" show-overflow-tooltip show-tooltip-when-overflow label="优先级"/>
         <el-table-column prop="handle_class" show-overflow-tooltip show-tooltip-when-overflow width="150" label="处理类"/>
         <el-table-column prop="is_send" show-overflow-tooltip show-tooltip-when-overflow label="立即下发"/>

wms_pro/qd/src/views/wms/stor_manage/warehouse/pick/TaskDialog.vue

@@ -379,6 +379,9 @@ export default {
         })
         this.tabledis[index].qty = this.currentDtl.qty-dis_assign_qty
       }
+      if (taskType == "23"){
+        this.tabledis[index].qty = this.currentDtl.assign_qty
+      }
     },
     savePickTask() {
       pick.savePickTask(this.tabledis).then(res => {