Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/warehouseBusiness/outStock/index.vue

src/views/warehouseBusiness/outStock/index.vue

@@ -327,7 +327,7 @@
             size="mini"
             type="text"
             icon="el-icon-delete"
-            v-if="scope.row.fBillstatus == 4 || scope.row.fBillstatus == 5"
+            v-if="scope.row.fBillstatus === 4 || scope.row.fBillstatus === 5"
             @click="handleUpdate(scope.row, true)"
           >审核进度
           </el-button>
@@ -435,8 +435,8 @@
                 placeholder="请输入模糊查找"
               >
                 <el-option
-                  v-for="dict in userOptions"
-                  :key="dict.userName"
+                  v-for="(dict, index) in userOptions"
+                  :key="index.userName"
                   :label="dict.nickName"
                   :value="dict.userName"
                 ></el-option>
@@ -486,8 +486,8 @@
                 style="width: 80%"
               >
                 <el-option
-                  v-for="dict in fIfdamageOptions"
-                  :key="dict.dictValue"
+                  v-for="(dict, index) in fIfdamageOptions"
+                  :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
                 />
@@ -504,8 +504,8 @@
                 style="width: 80%"
               >
                 <el-option
-                  v-for="dict in fIfweighOptions"
-                  :key="dict.dictValue"
+                  v-for="(dict, index) in fIfweighOptions"
+                  :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
                 />
@@ -562,8 +562,8 @@
                 style="width: 80%"
               >
                 <el-option
-                  v-for="dict in jFeetunitOptions"
-                  :key="dict.dictValue"
+                  v-for="(dict, index) in jFeetunitOptions"
+                  :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
                 />
@@ -676,8 +676,8 @@
                   style="width: 80%"
                 >
                   <el-option
-                    v-for="dict in fTrademodeidOptions"
-                    :key="dict.dictValue"
+                    v-for="(dict, index) in fTrademodeidOptions"
+                    :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
                   />
@@ -706,8 +706,8 @@
                   remote
                 >
                   <el-option
-                    v-for="dict in deptOptions"
-                    :key="dict.deptId"
+                    v-for="(dict, index) in deptOptions"
+                    :key="index.deptId"
                     :label="dict.deptName"
                     :value="dict.deptId"
                   ></el-option>
@@ -827,6 +827,21 @@
         >
           <template slot-scope="scope">
             <el-select v-model="scope.row.fBusinessType"
+                       filterable
+                       disabled
+                       :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
               :remote-method="kqhouseRemoteMethod"
@@ -848,21 +863,7 @@
           width="140px"
           label="*业务详情"
         >
-          <template slot-scope="scope">
-            <el-input
-              v-model="scope.row.fMarks"
-              placeholder="业务详情"
-              :disabled="
-                browseStatus ||
-                scope.row.fBillstatus === 20 ||
-                scope.row.fBillstatus === 30 ||
-                scope.row.fBillstatus === 40
-              "
-              show-word-limit
-            />
-          </template>
         </el-table-column>
-
         <el-table-column
           prop="fWarehouselocids"
           header-align="center"
@@ -870,25 +871,6 @@
           align="center"
           label="*库区"
         >
-          <template slot-scope="scope">
-            <el-select
-              v-model="scope.row.fWarehouselocids"
-              filterable
-              remote
-              :disabled="
-                browseStatus ||
-                scope.row.fBillstatus === 40"
-              :remote-method="kqhouseRemoteMethod"
-              placeholder="请选择库区"
-            >
-              <el-option
-                v-for="(dict, index) in kqhouseOptions"
-                :key="index.fId"
-                :label="dict.fName"
-                :value="dict.fId"
-              ></el-option>
-            </el-select>
-          </template>
         </el-table-column>
         <el-table-column
           prop="fPlanqty"
@@ -1102,7 +1084,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fDriverIdCar"
           header-align="center"
@@ -1119,7 +1100,6 @@
             />
           </template>
         </el-table-column>
-
         <el-table-column
           prop="fIsPass"
           header-align="center"
@@ -1131,7 +1111,7 @@
             <el-select
               v-model="scope.row.fIsPass"
               placeholder="是否放行"
-              :disabled="browseStatus || scope.row.fBillstatus === 20 || scope.row.fBillstatus === 40"
+              :disabled="browseStatus || scope.row.fBillstatus === 40"
               style="width: 80%"
             >
               <el-option
@@ -1811,7 +1791,7 @@
         <el-button type="warning" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="showEditDialog_s"
         >出库单
         </el-button>
-        <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货完成</el-button>
+        <el-button :disabled="printinglist.length <= 0 || browseStatus" @click="discharge">装货</el-button>
         <el-button type="info" prop="打印" :disabled="printinglist.length <= 0 || browseStatus" @click="printJobSheet"
         >作业单
         </el-button>
@@ -1822,8 +1802,8 @@
           :disabled="browseStatus"
         >请核</el-button
         >
-        <el-button type="danger" v-if="form.fBillstatus == '6'" @click="revoke">撤销请核</el-button>
-        <el-button type="danger" v-if="form.fBillstatus == '4' && current == before" @click="revokeTwo">撤销请核</el-button>
+        <el-button type="danger" v-if="form.fBillstatus === 6" @click="revoke">撤销请核</el-button>
+        <el-button type="danger" v-if="form.fBillstatus === 4 && current === before" @click="revokeTwo">撤销请核</el-button>
         <el-button @click="cancelTwo" v-if="approVal === true">取 消</el-button>
         <el-button @click="cancel" v-else>取 消</el-button>
       </div>
@@ -2894,7 +2874,6 @@ export default {
         fLineno:this.form.fCorpid,
         fFeeid:this.dataList[0].fGoodsid
       }
-      console.log(data)
       operationAgreement(data).then((response) => {
         this.tasklegList = response.rows;
         this.whgenlegTotal = response.total;
@@ -2906,9 +2885,13 @@ export default {
         billId:this.form.fId,
         id:this.form.fId
       }
-      console.log(data)
       revokeTwo(data).then(data =>{
-        console.log(data)
+        if (data.code === 200) {
+          this.msgSuccess("撤销成功");
+          this.open = false;
+          this.getList()
+          this.reset();
+        }
       })
     },
     // 导入付款信息
@@ -3111,7 +3094,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 + ''
 
         });
       }
@@ -3144,98 +3127,73 @@ export default {
     },
     // 作业单打印
     printJobSheet() {
-      // if (this.feelDrSelection.length <= 0) {
-      //   this.$message.error("请勾选收款信息!");
-      //   return false;
-      // }
-      if(this.printinglist.length > 0) {
-        for (let fee in this.feelDrSelection) {
-          if (!this.feelDrSelection[fee].fCorpid) {
-            this.$message.error("请维护收款费用客户名称!");
-            return false;
-          }
-          if (!this.feelDrSelection[fee].fFeeid) {
-            this.$message.error("请维护收款费用费用信息!");
-            return false;
+      if (this.printinglist.length <= 0) {
+        this.$message.error("请维护出库明细!");
+        return false;
+      }
+      let fTruckno = this.printinglist[0].fTruckno
+      let fDriverName = this.printinglist[0].fDriverName
+      for (let li in this.printinglist) {
+        for (let list in this.fStorageTypeOptions) {
+          if (this.printinglist[li].fBusinessType === this.fStorageTypeOptions[list].dictValue) {
+            this.$set(this.printinglist[li], 'fBusinessTypes', this.fStorageTypeOptions[list].dictLabel)
+            break
           }
         }
-        for (let li in this.printinglist) {
-          for (let list in this.fStorageTypeOptions) {
-            if (this.printinglist[li].fBusinessType === this.fStorageTypeOptions[list].dictValue) {
-              this.$set(this.printinglist[li], 'fBusinessTypes', this.fStorageTypeOptions[list].dictLabel)
+        if (!this.printinglist[li].fId) {
+          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
+        } else if (!this.printinglist[li].fDriverName || this.printinglist[li].fDriverName !== fDriverName) {
+          this.$message.error('请填写司机姓名选择相同司机姓名')
+          return false
+        } else if (!this.printinglist[li].fDriverTel) {
+          this.$message.error('请选填写司机电话')
+          return false
+        } else if (!this.printinglist[li].fDriverIdCar) {
+          this.$message.error('请选填写司机身份证')
+          return false
+        } else if (!this.printinglist[li].fDriverName) {
+          this.$message.error('请输入司机姓名')
+          return false
+        } else if (!this.printinglist[li].fDriverTel) {
+          this.$message.error('请输入司机电话')
+          return false
+        }
+        // 获取业务日期
+        var date = new Date(this.form.fBsdate)
+        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.fBsdate = Y + M + D
+        for (let dr in this.feelDrSelection) {
+          for (let opt in this.fWbuOptions) {
+            if (this.fWbuOptions[opt].fId === this.feelDrSelection[dr].fFeeid) {
+              this.$set(this.feelDrSelection[dr], 'fFeeName', this.fWbuOptions[opt].fName)
               break
             }
           }
-          if (!this.printinglist[li].fId) {
-            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
-          }
-          let fTruckno = this.printinglist[0].fTruckno
-          let fDriverName = this.printinglist[0].fDriverName
-          for (let warehouseCr in this.printinglist) {
-            if (!this.printinglist[warehouseCr].fTruckno || this.printinglist[warehouseCr].fTruckno !== fTruckno) {
-              this.$message.error('请填写车号或选择车相同车号')
-              return false
-            } 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
-            } else if (!this.printinglist[warehouseCr].fDriverTel) {
-              this.$message.error('请选填写司机电话')
-              return false
-            } else if (!this.printinglist[warehouseCr].fDriverIdCar) {
-              this.$message.error('请选填写司机身份证')
-              return false
-              } else if (!this.printinglist[warehouseCr].fNetweight) {
-                this.$message.error('请选择出库净重')
-                return false
-            } else if (!this.printinglist[warehouseCr].fDriverName) {
-              this.$message.error('请输入司机姓名')
-              return false
-            } else if (!this.printinglist[warehouseCr].fDriverTel) {
-              this.$message.error('请输入司机电话')
-              return false
-            }
-          }
-          // 获取业务日期
-          var date = new Date(this.form.fBsdate)
-          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.fBsdate = Y + M + D
-          for (let dr in this.feelDrSelection) {
-            for (let opt in this.fWbuOptions) {
-              if (this.fWbuOptions[opt].fId === this.feelDrSelection[dr].fFeeid) {
-                this.$set(this.feelDrSelection[dr], 'fFeeName', this.fWbuOptions[opt].fName)
-                break
-              }
-            }
-          }
-          setTimeout(() => {
-            this.openPrintJobSheet = true
-          }, 200);
         }
+        setTimeout(() => {
+          this.openPrintJobSheet = true
+        }, 200);
       }
     },
     showEditDialog_ss() {
       if (this.printinglist.length > 0) {
         for (let warehouseCr in this.printinglist) {
-          if (
-            this.printinglist[warehouseCr].fTruckno != this.printinglist[0].fTruckno
-          ) {
+          if (this.printinglist[warehouseCr].fTruckno !== this.printinglist[0].fTruckno) {
             this.$message.error("请选择车相同车号");
             return false;
           }
@@ -3336,7 +3294,6 @@ export default {
       this.whgenlegParams.fWarehouseid = this.form.fWarehouseid;
       this.whgenlegParams.fTrademodeid = this.form.fTrademodeid;
       listWhgenleg(this.whgenlegParams).then((response) => {
-        console.log(response)
         this.whgenlegList = response.rows;
         this.whgenlegTotal = response.total;
       });
@@ -3472,10 +3429,14 @@ export default {
       const fId = row.fId || this.ids;
       this.dataList = [];
       getWarehousebills(fId).then((response) => {
-        this.before = response.data.corps[0].createBy
-        console.log(response.data.corps[0].createBy)
         if (response.data.warehousebills) {
           this.form = response.data.warehousebills;
+          this.before = this.form.createBy
+          this.$set(this.form, "fEta", Date.parse(this.form.fEta));
+          this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
+          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 + "");
           if (this.form.fBillstatus > 2) {
             this.approvalStatus = false;
           } else {
@@ -3505,68 +3466,31 @@ export default {
         }
         if (response.data.warehouseBillsItem) {
           this.dataList = response.data.warehouseBillsItem;
+          for (let list in this.dataList) {
+            this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
+          }
         }
         if (response.data.enclosures) {
           this.relevantAttachments = response.data.enclosures;
         }
-        this.$set(this.form, "fStltypeid", this.form.fStltypeid + "");
-        this.$set(this.form, "fEta", Date.parse(this.form.fEta));
-        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)
-        // );
-        for (let list in this.dataList) {
-          this.$set(
-            this.dataList[list],
-            "fBsdate",
-            Date.parse(this.dataList[list].fBsdate)
-          );
-        }
         this.goodsOptions = response.data.goodsList;
         this.kqhouseOptions = response.data.warehouseAreas;
         this.warehouseDrList = response.data.warehousebillsfeesDr;
         for (let dr in this.warehouseDrList) {
-          this.$set(
-            this.warehouseDrList[dr],
-            "fFeeUnitid",
-            this.warehouseDrList[dr].fFeeunitid + ""
-          );
-          this.$set(
-            this.warehouseDrList[dr],
-            "fQty",
-            this.warehouseDrList[dr].fQty.toFixed(2)
-          );
-          this.$set(
-            this.warehouseDrList[dr],
-            "fAmount",
-            this.warehouseDrList[dr].fAmount.toFixed(2)
-          );
+          this.$set(this.warehouseDrList[dr], "fFeeUnitid", this.warehouseDrList[dr].fFeeunitid + "");
+          this.$set(this.warehouseDrList[dr], "fQty", this.warehouseDrList[dr].fQty.toFixed(2));
+          this.$set(this.warehouseDrList[dr], "fAmount", this.warehouseDrList[dr].fAmount.toFixed(2));
         }
         this.warehouseCrList = response.data.warehousebillsfeesCr;
         for (let cr in this.warehouseCrList) {
-          this.$set(
-            this.warehouseCrList[cr],
-            "fFeeUnitid",
-            this.warehouseCrList[cr].fFeeunitid + ""
-          );
+          this.$set(this.warehouseCrList[cr], "fFeeUnitid", this.warehouseCrList[cr].fFeeunitid + "");
         }
         this.userOptions = response.data.sysUser;
         this.open = true;
         this.title = "修改仓入库";
       });
       queryUserVal().then((response)=>{
-        console.log(response)
         this.current = response.user.userName
-        console.log(this.queryParams)
       })
     },
     // 数量计算
@@ -3762,9 +3686,7 @@ export default {
     },
     // 出库确认
     creditClick() {
-      console.log(this.dataList)
       this.$refs["form"].validate((valid) => {
-        console.log(this.dataListSelection[0].fIsPass)
         for (let warehouseCr in this.dataListSelection) {
           if (this.dataListSelection[warehouseCr].fBillstatus === 10) {
             this.$message.error("请先打印作业单");
@@ -3910,6 +3832,15 @@ export default {
         } else if (this.dataListSelection[li].fBillstatus >= 30) {
           this.$message.error('请勿重复卸货')
           return false
+        } else if (!this.dataListSelection[li].fQty || this.dataListSelection[li].fQty === 0) {
+          this.$message.error('请维护出库件数')
+          return false
+        } else if (!this.dataListSelection[li].fGrossweight || this.dataListSelection[li].fGrossweight === 0) {
+          this.$message.error('请维护出库毛重')
+          return false
+        } else if (!this.dataListSelection[li].fNetweight || this.dataListSelection[li].fNetweight === 0) {
+          this.$message.error('请维护出库净重')
+          return false
         }
       }
       this.$refs['form'].validate((valid) => {
@@ -3921,9 +3852,6 @@ export default {
           formData.append("warehousebillsitems", JSON.stringify(this.dataListSelection));
           formData.append("warehousebillsfeesCr", JSON.stringify(this.warehouseCrList));
           formData.append("warehousebillsfeesDr", JSON.stringify(this.warehouseDrList));
-          for (let li in this.dataListSelection) {
-            this.dataListSelection[li].fBillstatus = 30
-          }
           this.formBrowseStatus = true
           this.$refs.tableList.clearSelection()
           disChargelist(formData).then((response) => {
@@ -3999,14 +3927,14 @@ export default {
           this.$message.error('请添加库存明细!')
           return false
         }
-        // for (let li in this.dataList) {
-        //   for(let list in this.fStorageTypeOptions){
-        //     if (this.dataList[li].fBusinessType  === this.fStorageTypeOptions[list].dictLabel) {
-        //       this.$set(this.dataList[li], 'fBusinessType', this.fStorageTypeOptions[list].dictValue)
-        //       break
-        //     }
-        //   }
-        // }
+        for (let li in this.dataList) {
+          for(let list in this.fStorageTypeOptions){
+            if (this.dataList[li].fBusinessType  === this.fStorageTypeOptions[list].dictLabel) {
+              this.$set(this.dataList[li], 'fBusinessType', this.fStorageTypeOptions[list].dictValue)
+              break
+            }
+          }
+        }
         // for (let list in this.dataList) {
         //   this.changeOutStock(this.dataList[list])
           // if (!this.dataList[list].fQty || Number(this.dataList[list].fQty) === 0) {
@@ -4045,7 +3973,6 @@ export default {
               for (let list in this.dataList) {
                 // this.$set(this.dataList[list], "fBsdate", Date.parse(this.dataList[list].fBsdate));
                 this.$set(this.dataList[list], "fBusinessType", this.dataList[list].fBusinessType + '');
-                console.log(this.dataList)
               }
             })
           }, 200);