opt:提交用料出库

nladmin-ui/src/views/wms/st/outbill/AddDialog.vue

@@ -116,7 +116,7 @@
            type="primary"
            icon="el-icon-plus"
            size="mini"
-           @click="queryDtl()"
+           @click="queryOrderDtl()"
          >
           用料清单物料
         </el-button>
@@ -142,12 +142,11 @@
       :header-cell-style="{background:'#f5f7fa',color:'#606266'}"
     >
       <el-table-column type="index" label="序号" width="50" align="center" />
-      <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="190" align="center" />
+      <el-table-column prop="material_code" label="物料编码" width="190" align="center" />
       <el-table-column prop="material_name" label="物料名称" align="center" min-width="150px" show-overflow-tooltip />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="批次号" width="150px" align="center" />
-      <el-table-column prop="plan_qty" label="出库重量" width="150" align="center" />
+      <el-table-column prop="plan_qty" label="数量" width="150" align="center" />
       <el-table-column prop="qty_unit_name" label="单位" align="center" />
-      <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
+      <el-table-column prop="source_bill_code" label="用料清单号" :min-width="flexWidth('source_bill_code',crud.data,'用料清单号')" />
       <el-table-column v-if="crud.status.cu > 0" align="center" label="操作" width="120" fixed="right">
         <template scope="scope">
           <el-button type="danger" class="filter-item" size="mini" icon="el-icon-delete" @click.native.prevent="deleteRow(scope.$index, form.tableData)" />
@@ -155,12 +154,14 @@
       </el-table-column>
     </el-table>
     <AddDtl :dialog-show.sync="dtlShow" :stor-id="storId" @tableChanged="tableChanged" />
+    <AddOrderDtl :dialog-show.sync="dtlShow2" :stor-id="storId" @tableChanged="tableChanged" />
   </el-dialog>
 </template>
 
 <script>
 import CRUD, { crud, form } from '@crud/crud'
 import AddDtl from '@/views/wms/st/outbill/AddDtl'
+import AddOrderDtl from '@/views/wms/st/outbill/AddOrderDtl'
 import checkoutbill from '@/views/wms/st/outbill/checkoutbill'
 import crudBsrealstorattr from '@/views/wms/basedata/bsrealstorattr/bsrealstorattr'
 
@@ -181,7 +182,7 @@ const defaultForm = {
 }
 export default {
   name: 'AddDialog',
-  components: { AddDtl },
+  components: { AddDtl, AddOrderDtl },
   mixins: [crud(), form(defaultForm)],
   props: {
     dialogShow: {
@@ -194,13 +195,9 @@ export default {
     return {
       dialogVisible: false,
       dtlShow: false,
-      materType: '',
-      materShow: false,
+      dtlShow2: false,
       flagnow: false,
-      nowrow: {},
-      nowindex: '',
       storlist: [],
-      invtypelist: [],
       storId: null,
       rules: {
         stor_id: [
@@ -250,6 +247,22 @@ export default {
         }
       })
     },
+    queryOrderDtl(index, row) {
+      if (this.form.bill_type === '') {
+        this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.stor_id === '') {
+        this.crud.notify('请选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      if (this.form.bill_type !== '1001') {
+        this.crud.notify('请选择用料出库！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
+      this.storId = this.form.stor_id
+      this.dtlShow2 = true
+    },
     queryDtl(index, row) {
       if (this.form.bill_type === '') {
         this.crud.notify('请选择业务类型！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -259,6 +272,10 @@ export default {
         this.crud.notify('请选择仓库！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
+      if (this.form.bill_type !== '1009') {
+        this.crud.notify('请选择手工出库！', CRUD.NOTIFICATION_TYPE.INFO)
+        return
+      }
       this.storId = this.form.stor_id
       this.dtlShow = true
     },