add:添加任务配置

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

@@ -63,7 +63,7 @@
               @change="handTaskStatus"
             >
               <el-option
-                v-for="item in taskStatusList"
+                v-for="item in statusEnum.FORM_STATUS"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -244,7 +244,6 @@ export default {
     }
   },
   created() {
-    this.getTaskStatusList()
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -261,15 +260,6 @@ export default {
       }
       this.crud.toQuery()
     },
-    getTaskStatusList() {
-      crudDict.getStatusEnum("FORM_STATUS").then(res => {
-        this.taskStatusList = res
-      })
-    },
-    getStatusName(code) {
-      const status = this.taskStatusList.find(item => item.code === code)
-      return status ? status.name : '-'
-    },
     doOperate(row, command) {
       let method_name = ''
       switch (command) {

wms_pro/qd/src/views/wms/flow_manage/act/execution/curdExecution.js

@@ -17,7 +17,7 @@ export function getDtl(proc_inst_id) {
 
 export function del(ids) {
   return request({
-    url: 'api/flow',
+    url: 'api/bpmnExecution',
     method: 'delete',
     data: ids
   })

wms_pro/qd/src/views/wms/stor_manage/in/index.vue

@@ -169,7 +169,7 @@
 
 <script>
 import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
-import crudProductOut from '@/views/wms/stor_manage/in/storinvin'
+import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
 import CRUD, { crud, header,form, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -199,14 +199,14 @@ const defaultForm = {
 
 export default {
   name: 'ProductOut',
-  components: { TaskDialog, AddDialog, ViewDialog, formstruc, crudProductOut, crudOperation, rrOperation, udOperation, pagination },
+  components: { TaskDialog, AddDialog, ViewDialog, formstruc, crudProductIn, crudOperation, rrOperation, udOperation, pagination },
   cruds() {
     return CRUD({
       title: '',
       optShow: { add: true, reset: true },
       idField: 'id',
       url: '/api/stIvtIostorinv',
-      crudMethod: { ...crudProductOut },
+      crudMethod: { ...crudProductIn },
       query:{
         in_storage :true
       },
@@ -270,7 +270,7 @@ export default {
         this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudProductOut.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+      crudProductIn.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
         this.crud.notify('单据确认成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
@@ -287,7 +287,7 @@ export default {
         this.crud.notify('请选择一条单据', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
-      crudProductOut.taskOpen(this.currentRow ).then(res => {
+      crudProductIn.taskOpen(this.currentRow ).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })

wms_pro/qd/src/views/wms/stor_manage/in/storinvin.js

@@ -54,38 +54,6 @@ export function inDecision(data) {
   })
 }
 
-export function getSect(data) {
-  return request({
-    url: '/api/stIvtSectattr/getSect',
-    method: 'post',
-    data
-  })
-}
-
-export function divStruct(data) {
-  return request({
-    url: '/api/stIvtIostorinv/divStruct',
-    method: 'post',
-    data
-  })
-}
-
-export function unDivStruct(data) {
-  return request({
-    url: '/api/stIvtIostorinv/unDivStruct',
-    method: 'post',
-    data
-  })
-}
-
-export function setPoint(data) {
-  return request({
-    url: '/api/stIvtIostorinv/setPoint',
-    method: 'post',
-    data
-  })
-}
-
 export function confirm(data) {
   return request({
     url: '/api/stIvtIostorinv/confirm',
@@ -101,6 +69,13 @@ export function cancelDecision(data) {
     data
   })
 }
+export function taskOpen(data) {
+  return request({
+    url: '/api/stIvtIostorinv/taskOpen',
+    method: 'post',
+    data
+  })
+}
 
 export function delTask(data) {
   return request({
@@ -135,9 +110,6 @@ export default {
   vehicleCheck,
   inDecision,
   cancelDecision,
-  getSect,
-  divStruct,
-  unDivStruct,
-  setPoint,
+  taskOpen,
   confirm
 }

wms_pro/qd/src/views/wms/stor_manage/out/AddDialog.vue

@@ -123,9 +123,22 @@
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="struct_code" label="分配仓位" />
-      <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="190" align="center">
+      <el-table-column show-overflow-tooltip prop="stor_code" label="仓库" width="160" align="center">
         <template scope="scope">
-          <el-input v-model="tableData[scope.$index].stor_code"  class="input-with-select" />
+          <el-select
+            v-model="tableData[scope.$index].stor_code"
+            clearable
+            class="filter-item"
+            placeholder="所属仓库"
+            @change="crud.toQuery"
+          >
+            <el-option
+              v-for="item in tableEnum.st_ivt_bsrealstorattr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
         </template>
       </el-table-column>
       <el-table-column show-overflow-tooltip prop="source_form_type" label="源单类型" width="190" align="center">
@@ -180,10 +193,8 @@
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
-import crudProductIn from '@/views/wms/stor_manage/in/storinvin'
 import MaterDialog from '@/views/wms/base_manage/material/MaterDialog'
 import FormDialog from '@/views/wms/pm_manage/form_data/FormDialog'
-import AddDtl from '@/views/wms/stor_manage/in/AddDtl'
 import formstruc from '@/views/wms/config_manage/formStruc/formstruc'
 import measureunit from '@/views/wms/base_manage/measure/measureunit'
 
@@ -206,9 +217,10 @@ const defaultForm = {
 
 export default {
   name: 'AddDialog',
-  components: { formstruc, MaterDialog,measureunit, FormDialog, AddDtl },
+  components: { formstruc, MaterDialog,measureunit, FormDialog },
   mixins: [crud(), form(defaultForm)],
   statusEnums: [ 'FORM_STATUS', 'IOBILL_TYPE_OUT' ],
+  tableEnums: [ 'st_ivt_bsrealstorattr#stor_name#stor_code' ],
   props: {
     dialogShow: {
       type: Boolean,
@@ -248,13 +260,13 @@ export default {
   methods: {
     open() {
       this.tableData = [],
-      formstruc.getHeader('st_ivt_iostorinv_out').then(res => {
+      formstruc.getHeader('st_ivt_iostorinv').then(res => {
         this.cols = res
         res.forEach(a => {
           this.form.form_data[a.value,'']
         })
       })
-      formstruc.getHeader('st_ivt_iostorinvdtl_out').then(res => {
+      formstruc.getHeader('st_ivt_iostorinvdtl').then(res => {
         this.dtlCols = res
       }),
         measureunit.getSelect().then(res => {

wms_pro/qd/src/views/wms/stor_manage/out/index.vue

@@ -207,6 +207,9 @@ export default {
       idField: 'id',
       url: '/api/stIvtIostorinvOut',
       crudMethod: { ...crudProductOut },
+      query:{
+        in_storage :false
+      },
       props: {
         size: 10
       }