样式更改

src/views/warehouseBusiness/inStock/index.vue

@@ -3955,6 +3955,11 @@ export default {
           fMarks:this.form.fMarks,
           fBusinessType:this.form.fBusinessType
         });
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10};
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
       }
     },
     addpayment() {
@@ -3980,6 +3985,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4135,6 +4145,7 @@ export default {
         for (let whgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[whgen].feeFId;
           getFees(feeId).then((response) => {
+            console.log(response)
             this.fWbuOptions.push(response.data);
           });
           let qty = 1;
@@ -4179,7 +4190,11 @@ export default {
         for (let zhgen in this.dialogWhgenlegList) {
           let feeId = this.dialogWhgenlegList[zhgen].feeFId;
           getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data);
+            this.fWbuOptions = []
+            let queryParams = { pageNum: 1, pageSize: 10};
+            listFees(queryParams).then((response) => {
+              this.fWbuOptions = response.rows;
+            });
           });
           let qty = 1;
           if (this.dialogWhgenlegList[zhgen].fFeeUnitid == 1) {
@@ -4428,6 +4443,10 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(status) {
+      let queryParams = {pageNum: 1, pageSize: 10};
+      listFees(queryParams).then((response) => {
+        this.fWbuOptions = response.rows;
+      });
       this.reset()
       this.form = {
         fItemsStatus: null,
@@ -4536,10 +4555,16 @@ export default {
         this.open = true;
         this.title = "修改仓入库";
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName
       })
+
     },
     // 库存总账多选框
     whgenlegSelectionChange(selection) {
@@ -5304,34 +5329,57 @@ export default {
             return false
           }
         }
-        for(let item in this.warehouseDrList){
-          if(!this.warehouseDrList[item].fCorpid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行客户名称")
-            return false
+
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
           }
-          if(!this.warehouseDrList[item].fFeeid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行费用名称")
-            return false
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
           }
-          if(!this.warehouseDrList[item].fFeeUnitid){
-            this.$message.error("请维护收款信息第"+ (Number(item)+1) +"行计价单位")
-            return false
+          if (!this.warehouseDrList[item].fFeeUnitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
           }
         }
-        for(let item in this.warehouseCrList){
-          if(!this.warehouseCrList[item].fCorpid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行客户名称")
-            return false
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
           }
-          if(!this.warehouseCrList[item].fFeeid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行费用名称")
-            return false
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
           }
-          if(!this.warehouseCrList[item].fFeeUnitid){
-            this.$message.error("请维护付款信息第"+ (Number(item)+1) +"行计价单位")
-            return false
+
+          if (!this.warehouseCrList[item].fFeeUnitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
           }
         }
+
         if (valid) {
           this.form.fBillstatus = status
           this.form.fNetweight = this.fNetweight

src/views/warehouseBusiness/outStock/index.vue

@@ -3668,11 +3668,17 @@ export default {
             }
           }
         }
-        if (!haveGoods) {
-          getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data)
-          })
-        }
+        // if (!haveGoods) {
+        //   console.log("111")
+        //
+        // }
+        getFees(feeId).then((response) => {
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10 };
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
+        })
         let qty = 1;
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
           qty = this.fQty
@@ -4045,6 +4051,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     //仓库电话、仓库联系人带入
@@ -4077,6 +4088,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4375,6 +4391,11 @@ export default {
         this.open = true;
         this.title = "修改仓入库";
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
       queryUserVal().then((response)=>{
         this.current = response.user.userName
@@ -5063,20 +5084,55 @@ export default {
           }
         }
 
-        // for (let index in this.warehouseDrList) {
-        //   if (!this.warehouseDrList[index].fCorpid) {
-        //     console.log(index)
-        //     console.log(this.warehouseDrList[index].fCorpid)
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
-        // for (let list in this.warehouseCrList) {
-        //   if (!this.warehouseCrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+
+          if (!this.warehouseCrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
         if (valid) {
           setTimeout(() => {
             this.form.fBillstatus = status

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -3515,11 +3515,18 @@ export default {
             }
           }
         }
-        if (!haveGoods) {
-          getFees(feeId).then((response) => {
-            this.fWbuOptions.push(response.data)
-          })
-        }
+        getFees(feeId).then((response) => {
+          this.fWbuOptions = []
+          let queryParams = { pageNum: 1, pageSize: 10 };
+          listFees(queryParams).then((response) => {
+            this.fWbuOptions = response.rows;
+          });
+        })
+        // if (!haveGoods) {
+        //   getFees(feeId).then((response) => {
+        //     this.fWbuOptions.push(response.data)
+        //   })
+        // }
         let qty = 1;
         if (this.dialogWhgenlegList[zhgen].fFeeUnitid === 1) {
           qty = this.fQty
@@ -3759,6 +3766,11 @@ export default {
           fMarks:this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     addpayment() {
@@ -3782,6 +3794,11 @@ export default {
           fMarks: this.form.fMarks,
           fBusinessType: this.form.fBusinessType
         });
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       }
     },
     queryUser() {
@@ -4247,6 +4264,11 @@ export default {
         this.title = "修改调拨";
 
         this.warehousesssMethod()
+        this.fWbuOptions = []
+        let queryParams = { pageNum: 1, pageSize: 10};
+        listFees(queryParams).then((response) => {
+          this.fWbuOptions = response.rows;
+        });
       });
     },
     // 数量计算
@@ -4884,18 +4906,55 @@ export default {
             return false
           }
         }
-        // for (let list in this.warehouseDrList) {
-        //   if (!this.warehouseDrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
-        // for (let list in this.warehouseCrList) {
-        //   if (!this.warehouseCrList[list].fCorpid) {
-        //     this.$message.error('请选择客户名称')
-        //     return false
-        //   }
-        // }
+        for(let item in this.warehouseDrList) {
+          if (!this.warehouseDrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+              console.log(item)
+            } else {
+              console.log(this.warehouseDrList[item].fCorpid)
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+          if (!this.warehouseDrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护收款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
+        for(let item in this.warehouseCrList) {
+          if (!this.warehouseCrList[item].fCorpid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行客户名称")
+              return false
+            }
+          }
+          if (!this.warehouseCrList[item].fFeeid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行费用名称")
+              return false
+            }
+          }
+
+          if (!this.warehouseCrList[item].fFeeunitid) {
+            if (item === 'fBusinessType') {
+            } else {
+              this.$message.error("请维护付款信息第" + (Number(item) + 1) + "行计价单位")
+              return false
+            }
+          }
+        }
         if (valid) {
           setTimeout(() => {
             this.form.fBillstatus = status

src/views/warehouseBusiness/storageFeeCalculation/index.vue

@@ -296,14 +296,14 @@
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="客户名称" prop="fCorpid">
               <el-select
                 v-model="form.fCorpid"
                 filterable
                 remote
                 :disabled="browseStatus"
-                style="width: 80%"
+                style="width:80%"
                 :remote-method="corpsRemoteMethod"
                 placeholder="请输入模糊查找"
               >
@@ -316,11 +316,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="货品名称" prop="fGoodsid">
               <el-select
                 v-model="form.fGoodsid"
                 filterable
+                style="width:80%"
                 :disabled="browseStatus"
                 remote
                 :remote-method="goodsRemoteMethod"
@@ -335,22 +336,25 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="提单号" prop="fMblno">
               <el-input
                 v-model="form.fMblno"
-                style="width: 80%"
+                style="width:80%"
                 :disabled="browseStatus"
                 placeholder="手工输入"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+        </el-row>
+        <el-row>
+        <el-col :span="8">
             <el-form-item disabled label="仓储费截止日期" prop="fBillingDeadline">
               <el-date-picker
                 v-model="form.fBillingDeadline"
                 size="large"
                 type="date"
+                style="width:80%"
                 :disabled="browseStatus"
                 value-format="timestamp"
                 placeholder="仓储费计算截止日期"
@@ -358,54 +362,55 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="业务编号" prop="fBillno">
               <el-input
                 disabled
                 v-model="form.fBillno"
-                style="width: 80%"
+                style="width:80%"
                 placeholder="业务编号"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item label="制单人" prop="createBy">
               <el-input
                 disabled
                 v-model="form.createBy"
-                style="width: 80%"
+                style="width:80%"
                 placeholder="制单人"
               />
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          </el-row>
+        <el-row>
+          <el-col :span="8">
             <el-form-item disabled label="制单日期" prop="fbilldate">
               <el-date-picker
                 v-model="form.createTime"
                 size="large"
                 type="date"
                 disabled
-                style="width:200px"
+                style="width:80%"
                 value-format="timestamp"
                 placeholder="制单日期"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="5">
+          <el-col :span="8">
             <el-form-item disabled label="备注" prop="remark">
               <el-input
+                style="width:80%"
                 :disabled="browseStatus"
                 v-model="form.remark"
-                placeholder="制单人"
+                placeholder=""
               />
             </el-form-item>
           </el-col>
         </el-row>
       </el-form>
-      <div style="font-size:18px">
+      <div style="font-size:18px; padding-top:8px">
         计费物资明细
         <el-button :disabled="browseStatus" @click="calculateCost">计算仓储费</el-button>
         <el-button type="primary" :disabled="browseStatus" @click="submitForm(2)">保 存</el-button>
@@ -1465,8 +1470,11 @@
         this.disappear = false
         this.notChange = true
         this.browseStatus = status;
-        let data = row || this.ids;
-        getStorageFeeCalculation(data.fId).then((response) => {
+        let fId = row.fId || this.ids;
+        if (fId.length === 1){
+          fId = fId[0].fId
+        }
+        getStorageFeeCalculation(fId).then((response) => {
           this.fMblnoOptions = []
           if (response.data.corps) {
             this.fMblnoOptions.push(response.data.corps)