Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

mes/qd/src/views/wms/storage_manage/product/productMoreOrless/AddDialog.vue

@@ -391,9 +391,11 @@ export default {
       this.form.sect_name = row.sect_name
       this.form.struct_name = row.struct_name
       crudMoreOrless.getStructIvt({'struct_id': row.struct_id}).then(res => {
+        debugger
         this.form.tableData = res
         for (let i = 0; i < this.form.tableData.length; i++) {
           const row = this.form.tableData[i]
+          row.material_id = row.material_id.toString()
           this.$set(row, 'edit', false)
           this.form.tableData.splice(i, 1, row)
         }
@@ -407,7 +409,7 @@ export default {
       this.nowrow = row
     },
     async queryStruct() {
-      if (!this.form.mol_type) {
+      if (!this.form.mol_type) {structShow
         this.crud.notify('请先选择损溢类型！', CRUD.NOTIFICATION_TYPE.INFO)
         return
       }
@@ -450,6 +452,7 @@ export default {
       this.form.struct_name = ''
     },
     handleEdit(index, row) {
+      row.material_id = row.material_id.toString()
       if (!row.edit) {
         if (typeof (row.mol_qty) === 'undefined' | (parseFloat(row.mol_qty) <= 0)) {
           this.crud.notify('不允许损溢数量为0！', CRUD.NOTIFICATION_TYPE.INFO)
@@ -459,6 +462,10 @@ export default {
           this.crud.notify('物料不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
           return false
         }
+        if (!row.storagevehicle_code) {
+          this.crud.notify('载具号不可为空！', CRUD.NOTIFICATION_TYPE.INFO)
+          return false
+        }
         if (this.form.mol_type === '0' && (parseFloat(row.ivt_qty) < parseFloat(row.mol_qty))) {
           this.crud.notify('不允许损数量大于库存数量！', CRUD.NOTIFICATION_TYPE.INFO)
           return false

mes/qd/src/views/wms/storage_manage/semiproduct/semiproductMoreOrless/index.vue

@@ -157,7 +157,7 @@
       <!--分页组件-->
       <pagination />
     </div>
-    <AddDialog @AddChanged="querytable" />
+<!--    <AddDialog @AddChanged="querytable" />-->
   </div>
 </template>
 
@@ -168,13 +168,13 @@ import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 import DateRangePicker from '@/components/DateRangePicker/index'
-import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog'
+// import AddDialog from '@/views/wms/storage_manage/semiproduct/semiproductMoreOrless/AddDialog'
 import { mapGetters } from 'vuex'
 import crudStorattr from '@/api/wms/basedata/st/storattr'
 
 export default {
   name: 'MoreOrLess',
-  components: { AddDialog, crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
+  components: { crudOperation, rrOperation, udOperation, pagination, DateRangePicker },
   cruds() {
     return CRUD({
       title: '',