rev:库存更新，入库确认

mes/qd/src/views/wms/pub/StructDialog.vue

@@ -47,10 +47,10 @@
       @select-all="onSelectAll"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column prop="point_code" label="点位编码" />
-      <el-table-column prop="point_name" label="点位名称" />
-      <el-table-column prop="region_name" label="区域名称" />
-      <el-table-column prop="product_area" label="生产车间" />
+      <el-table-column prop="struct_code" label="仓位编码" />
+      <el-table-column prop="struct_name" label="仓位名称" />
+      <el-table-column prop="sect_code" label="库区编码" />
+      <el-table-column prop="sect_name" label="库区名称" />
     </el-table>
     <!--分页组件-->
     <pagination />
@@ -66,20 +66,20 @@
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'
-import crudRegion from '@/views/wms/scheduler_manage/region/region'
+import crudStructattr from '@/api/wms/basedata/st/structattr'
 
 export default {
   name: 'StructDialog',
   components: { rrOperation, pagination },
   cruds() {
     return CRUD({
-      title: '点位',
+      title: '仓位',
       optShow: {},
-      url: 'api/region/getPointQuery',
-      idField: 'region_code',
-      sort: 'region_code,desc',
+      url: 'api/structattr',
+      idField: 'struct_code',
+      sort: 'struct_code,ASC',
       query: { search: '', is_lock: '1', lock_type: '', sect_id: '', stor_id: '' },
-      crudMethod: { ...crudRegion }
+      crudMethod: { ...crudStructattr }
     })
   },
   mixins: [presenter(), header()],

mes/qd/src/views/wms/storage_manage/product/productIn/AddDtl.vue

@@ -104,7 +104,7 @@ export default {
   cruds() {
     return CRUD({
       title: '用户',
-      url: '/api/in/rawAssist/getBillDtl',
+      url: '/api/mdPbBucketrecord',
       crudMethod: {},
       optShow: {
         reset: true

mes/qd/src/views/wms/storage_manage/product/productIn/DivDialog.vue

@@ -208,6 +208,18 @@
         <el-table-column show-overflow-tooltip prop="struct_code" label="货位" align="center" />
         <el-table-column show-overflow-tooltip prop="point_code" label="入库点" align="center" />
         <el-table-column show-overflow-tooltip prop="task_code" label="任务号" align="center" />
+        <el-table-column align="center" label="操作" width="170" fixed="right">
+          <template scope="scope">
+            <el-button
+              type="danger"
+              class="filter-item"
+              size="mini"
+              :disabled="disabledIos(scope.row)"
+              icon="el-icon-delete"
+              @click.native.prevent="deleteRow(scope.$index, form.tableMater)"
+            />
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
 
@@ -285,6 +297,14 @@ export default {
     }
   },
   methods: {
+    disabledIos(row) {
+      debugger
+      if (row.iostorinvdis_id === undefined) {
+        return false
+      } else {
+        return true
+      }
+    },
     open() {
       crudSectattr.getSect({ 'stor_id': this.storId }).then(res => {
         this.sects = res.content
@@ -381,6 +401,9 @@ export default {
         this.form.tableMater.splice(-1, 0, item)
       }
     },
+    deleteRow(index, rows) {
+      rows.splice(index, 1)
+    },
     tableRowClassName({ row, rowIndex }) {
       row.index = rowIndex
     },
@@ -441,9 +464,14 @@ export default {
         return
       }
       crudProductIn.confirmvehicle(this.form).then(res => {
-        this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
-        this.form.vehicle_code = ''
-        this.form.bucketunique = ''
+        crudProductIn.getIosInvDtl({ 'iostorinv_id': this.form.dtl_row.iostorinv_id }).then(res => {
+          this.form.vehicle_code = ''
+          this.form.bucketunique = ''
+          this.openParam = res
+          this.form.tableMater = []
+          this.dis_row = null
+          this.crud.notify('组盘成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        })
       })
 
     },

mes/qd/src/views/wms/storage_manage/product/productIn/ViewDialog.vue

@@ -235,13 +235,13 @@ export default {
       this.currentDis = current
     },
     queryTableDtl() {
-      crudProductIn.getIODtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
+      crudProductIn.getIosInvDtl({ 'iostorinv_id': this.form.iostorinv_id }).then(res => {
         this.tableDtl = res
       })
     },
     queryTableDdis() {
       if (this.currentdtl !== null) {
-        crudProductIn.getDisTask({ 'iostorinvdtl_id': this.currentdtl.iostorinvdtl_id }).then(res => {
+        crudProductIn.getIosInvDis({  "iostorinvdtl_id": this.currentdtl.iostorinvdtl_id }).then(res => {
           this.tabledis = res
         }).catch(() => {
           this.tabledis = []

mes/qd/src/views/wms/storage_manage/product/productIn/index.vue

@@ -141,7 +141,7 @@
         >
           分配
         </el-button>
-        <el-button
+   <!--     <el-button
           slot="right"
           class="filter-item"
           type="success"
@@ -151,7 +151,7 @@
           @click="divOpen"
         >
           作业任务
-        </el-button>
+        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"