提交出入库

src/views/warehouseBusiness/inStock/index.vue

@@ -1368,7 +1368,7 @@
               "
               @click.native.prevent="wDeleteRow(scope.$index, dataList)"
               size="small"
-            >移1除</el-button
+            >移除</el-button
             >
           </template>
         </el-table-column>
@@ -3360,6 +3360,13 @@ export default {
     },
     showEditDialog_sss() {
       if (this.Printinglist.length > 0) {
+        // if (!this.form.fId) {
+        //   this.form.fId = this.fid
+        // }
+        if (!this.form.fBusinessType) {
+          this.$message.error('请选择货物属性!')
+          return false
+        }
         for (let li in this.Printinglist) {
           if (!this.Printinglist[li].fBsdate) {
             this.$message.error('请选择入库日期')
@@ -4108,6 +4115,20 @@ export default {
     // 入账
     creditClick() {
       this.$refs['form'].validate((valid) => {
+        for (let warehouseCr in this.Printinglist) {
+          if (!this.Printinglist[warehouseCr].fQty || this.Printinglist[warehouseCr].fQty === 0) {
+            this.$message.error("请维护入库件数");
+            return false;
+          }
+          if (!this.Printinglist[warehouseCr].fNetweight || this.Printinglist[warehouseCr].fNetweight === 0) {
+            this.$message.error("请维护入库净重");
+            return false;
+          }
+          if (!this.Printinglist[warehouseCr].fGrossweight || this.Printinglist[warehouseCr].fGrossweight === 0) {
+            this.$message.error("请维护入库毛重");
+            return false;
+          }
+        }
         for (let warehouseCr in this.dataListSelection) {
           if (this.dataListSelection[warehouseCr].fBillstatus === 20) {
             this.$message.error('请先卸货')
@@ -4249,18 +4270,18 @@ export default {
             this.$message.error("请勿重复卸货");
             return false;
           }
-          if (!this.Printinglist[warehouseCr].fQty || this.Printinglist[warehouseCr].fQty === 0) {
-            this.$message.error("请维护入库件数");
-            return false;
-          }
-          if (!this.Printinglist[warehouseCr].fNetweight || this.Printinglist[warehouseCr].fNetweight === 0) {
-            this.$message.error("请维护入库净重");
-            return false;
-          }
-          if (!this.Printinglist[warehouseCr].fGrossweight || this.Printinglist[warehouseCr].fGrossweight === 0) {
-            this.$message.error("请维护入库毛重");
-            return false;
-          }
+          // if (!this.Printinglist[warehouseCr].fQty || this.Printinglist[warehouseCr].fQty === 0) {
+          //   this.$message.error("请维护入库件数");
+          //   return false;
+          // }
+          // if (!this.Printinglist[warehouseCr].fNetweight || this.Printinglist[warehouseCr].fNetweight === 0) {
+          //   this.$message.error("请维护入库净重");
+          //   return false;
+          // }
+          // if (!this.Printinglist[warehouseCr].fGrossweight || this.Printinglist[warehouseCr].fGrossweight === 0) {
+          //   this.$message.error("请维护入库毛重");
+          //   return false;
+          // }
         }
         this.$refs["form"].validate((valid) => {
           if (valid) {
@@ -4323,13 +4344,13 @@ export default {
           this.form.fPlanvolumn = this.fPlanvolumn
           this.form.fGrossweight = this.fGrossweight
           this.form.fQty = this.fQty
-          if (!this.form.fId) {
-            this.form.fId = this.fid
-          }
-          if (!this.form.fBusinessType) {
-            this.$message.error('请选择货物属性!')
-            return false
-          }
+          // if (!this.form.fId) {
+          //   this.form.fId = this.fid
+          // }
+          // if (!this.form.fBusinessType) {
+          //   this.$message.error('请选择货物属性!')
+          //   return false
+          // }
           for (let list in this.dataList) {
             if (!this.dataList[list].fBusinessType) {
               this.$message.error('请输入库存明细的货物属性!')

src/views/warehouseBusiness/outStock/index.vue

@@ -3246,14 +3246,14 @@ export default {
           this.$message.error("请先保存!");
           return false;
         }
-        if (!this.printinglist[li].fBusinessType) {
-          this.$message.error('请先维护业务类型!')
-          return false
-        }
-        if (!this.printinglist[li].fMarks) {
-          this.$message.error('请先维护业务详情!')
-          return false
-        }
+        // if (!this.printinglist[li].fBusinessType) {
+        //   this.$message.error('请先维护业务类型!')
+        //   return false
+        // }
+        // if (!this.printinglist[li].fMarks) {
+        //   this.$message.error('请先维护业务详情!')
+        //   return false
+        // }
         if (!this.printinglist[li].fTruckno || this.printinglist[li].fTruckno !== fTruckno) {
           this.$message.error('请填写车号或选择车相同车号')
           return false

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -315,8 +315,9 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
+            v-show="scope.row.fItemsStatus !== 6"
             @click="handleDelete(scope.row)"
-            v-if="scope.row.fBillstatus <= 3"
+            v-if="scope.row.fBillstatus < 4"
             v-hasPermi="['warehouseBusiness:stockTransfer:remove']"
             >删除
           </el-button>