出库修改

src/views/warehouseBusiness/outStock/index.vue

@@ -824,21 +824,21 @@
           align="center"
           label="*业务类型"
         >
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.fBusinessType"
-              filterable
-              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"
-              :remote-method="kqhouseRemoteMethod"
-              placeholder="请选择业务类型"
-            >
-              <el-option
-                v-for="(dict, index) in fStorageTypeOptions"
-                :key="index.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </template>
+<!--          <template slot-scope="scope">-->
+<!--            <el-select v-model="scope.row.fBusinessType"-->
+<!--              filterable-->
+<!--              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 30 || scope.row.fBillstatus === 40"-->
+<!--              :remote-method="kqhouseRemoteMethod"-->
+<!--              placeholder="请选择业务类型"-->
+<!--            >-->
+<!--              <el-option-->
+<!--                v-for="(dict, index) in fStorageTypeOptions"-->
+<!--                :key="index.dictValue"-->
+<!--                :label="dict.dictLabel"-->
+<!--                :value="dict.dictValue"-->
+<!--              />-->
+<!--            </el-select>-->
+<!--          </template>-->
         </el-table-column>
         <el-table-column
           prop="fMarks"
@@ -2031,7 +2031,7 @@
         </div>
       </el-dialog>
       <el-dialog
-        title="入库页面"
+        title="出库页面"
         :modal="false"
         style="box-shadow: 0 1px 3px rgba(0, 0, 0, 0) !important"
         :visible.sync="editDialogVisible_s"
@@ -3072,12 +3072,12 @@ export default {
           this.$set(this.form, "fMblno", this.dialogWhgenlegList[whgen].fMblno);
         }
         this.changeInformation()
-        for (let list in this.fStorageTypeOptions) {
-          if (this.dialogWhgenlegList[whgen].fBusinessType  === this.fStorageTypeOptions[list].dictValue) {
-            this.$set(this.dialogWhgenlegList[whgen], 'fBusinessType', this.fStorageTypeOptions[list].dictLabel)
-            break
-          }
-        }
+        // for (let list in this.fStorageTypeOptions) {
+        //   if (this.dialogWhgenlegList[whgen].fBusinessType  === this.fStorageTypeOptions[list].dictValue) {
+        //     this.$set(this.dialogWhgenlegList[whgen], 'fBusinessType', this.fStorageTypeOptions[list].dictLabel)
+        //     break
+        //   }
+        // }
         this.dataList.push({
           fId: null,
           fMblno: this.dialogWhgenlegList[whgen].fMblno,
@@ -3110,7 +3110,7 @@ export default {
           fDriverName:this.whgenlegList.fDriverName,
           fDriverTel:this.whgenlegList.fDriverTel,
           fDriverIdCar:this.whgenlegList.fDriverIdCar,
-          fBusinessType:this.dialogWhgenlegList[whgen].fBusinessType
+          fBusinessType:this.dialogWhgenlegList[whgen].fBusinessType + ''
 
         });
         console.log(this.dialogWhgenlegList[whgen].fWarehouseLocationids)
@@ -3129,7 +3129,7 @@ export default {
         var Y = date.getFullYear() + "-";
         var M = (date.getMonth() + 1 < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1) + "-";
         var D = (date.getDate() < 10 ? "0" + date.getDate() : date.getDate()) + " ";
-        this.$set(this.printinglist[aorp], "fBsdate", Y + M + D);
+        this.$set(this.printinglist[aorp], "fBsdates", Y + M + D);
       }
       this.editDialogVisible_s = true;
       for (let corp in this.fMblnoOptions) {
@@ -3188,6 +3188,9 @@ export default {
             } else if (!this.printinglist[warehouseCr].fDriverName || this.printinglist[warehouseCr].fDriverName !== fDriverName) {
               this.$message.error('请填写司机姓名选择相同司机姓名')
               return false
+            } else if (this.printinglist[warehouseCr].fQty == '0') {
+              this.$message.error('请选择出库件数')
+              return false
               } else if (!this.printinglist[warehouseCr].fGrossweight) {
                 this.$message.error('请选择出库毛重')
                 return false
@@ -3200,9 +3203,6 @@ export default {
               } else if (!this.printinglist[warehouseCr].fNetweight) {
                 this.$message.error('请选择出库净重')
                 return false
-              } else if (this.printinglist[warehouseCr].fQty == '0') {
-                this.$message.error('请选择出库件数')
-                return false
             } else if (!this.printinglist[warehouseCr].fDriverName) {
               this.$message.error('请输入司机姓名')
               return false
@@ -3515,16 +3515,16 @@ export default {
         this.$set(this.form, "fBsdate", Date.parse(this.form.fBsdate));
         this.$set(this.form, "createTime", Date.parse(this.form.createTime));
         this.$set(this.form, "fTrademodeid", this.form.fTrademodeid + "");
-        this.$set(
-          this.form,
-          "fPlannetweight",
-          this.form.fPlannetweight.toFixed(2)
-        );
-        this.$set(
-          this.form,
-          "fPlangrossweight",
-          this.form.fPlangrossweight.toFixed(2)
-        );
+        // this.$set(
+        //   this.form,
+        //   "fPlannetweight",
+        //   this.form.fPlannetweight.toFixed(2)
+        // );
+        // this.$set(
+        //   this.form,
+        //   "fPlangrossweight",
+        //   this.form.fPlangrossweight.toFixed(2)
+        // );
         for (let list in this.dataList) {
           this.$set(
             this.dataList[list],