Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/api/agreement/agreement.js

@@ -33,7 +33,14 @@ export function listAgreement(query) {
     params: query
   })
 }
-
+// 查询作业费协议
+export function operationAgreement(query) {
+  return request({
+    url: '/warehouseBusiness/agreementitems/list',
+    method: 'get',
+    params: query
+  })
+}
 // 查询仓储费详细
 export function getAgreement(fId) {
   return request({

src/views/agreement/agreementTask/index.vue

@@ -532,7 +532,7 @@ export default {
     fFeeunitidFormat(row, column) {
       return this.selectDictLabel(this.fFeeunitidOptions, row.fFeeunitid);
     },
-    /** 查询仓储费列表 */
+    /** 查询作业费列表 */
     getList() {
       this.loading = true
       listAgreement(this.queryParams).then(response => {

src/views/warehouseBusiness/outStock/index.vue

@@ -443,6 +443,7 @@
                 v-model="form.fWarehouseid"
                 filterable
                 remote
+                @change="changefWarehouseid(form)"
                 :disabled="browseStatus || formBrowseStatus"
                 style="width: 80%"
                 :remote-method="warehouseRemoteMethod"
@@ -1794,41 +1795,51 @@
           <el-table-column label="行号" type="index" width="80">
             </el-table-column>
           <el-table-column
-            prop="fCorpid"
+            prop="fCorpname"
             header-align="center"
             align="center"
             label="客户名称"
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fName"
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="fGoodsid"
-            header-align="center"
-            align="center"
-            label="单价"
+            label="费用名称"
           >
           </el-table-column>
           <el-table-column
-            prop="fQtyblc"
+            prop="fFeeUnitid"
             header-align="center"
             align="center"
-            label="录入人"
+            label="计价单位"
           >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fFeeUnitid"
+              placeholder="请选择计费单位"
+              @change="changeFeeUnit(scope.row)"
+              :disabled="browseStatus"
+              clearable
+            >
+              <el-option
+                v-for="dict in jFeetunitOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
           </el-table-column>
-          <el-table-column
-            prop="fBegindate"
+           <el-table-column
+            prop="fPrice"
             header-align="center"
             align="center"
-            label="录入时间"
+            label="单价"
           >
           </el-table-column>
+          
           <!-- <el-table-column
             prop="fMarks"
             header-align="center"
@@ -1846,7 +1857,7 @@
         />
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="whgenlegDatas">导入</el-button>
-          <el-button @click="warehousingagreements = false">取 消</el-button>
+          <el-button @click="warehousingagreement = false">取 消</el-button>
         </div>
       </el-dialog>
        <!-- 选择作业费协议数据 -->
@@ -1869,40 +1880,49 @@
           <el-table-column type="selection" width="55"> </el-table-column>
           <el-table-column label="行号" type="index" width="80">
             </el-table-column>
-          <el-table-column
-            prop="fCorpid"
+         <el-table-column
+            prop="fCorpname"
             header-align="center"
             align="center"
             label="客户名称"
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fName"
             header-align="center"
             align="center"
             width="180px"
-            label="计价单位"
+            label="费用名称"
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsid"
-            header-align="center"
-            align="center"
-            label="单价"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="fQtyblc"
+            prop="fFeeUnitid"
             header-align="center"
             align="center"
-            label="录入人"
+            label="计价单位"
           >
+          <template slot-scope="scope">
+            <el-select
+              v-model="scope.row.fFeeUnitid"
+              placeholder="请选择计费单位"
+              @change="changeFeeUnit(scope.row)"
+              :disabled="browseStatus"
+              clearable
+            >
+              <el-option
+                v-for="dict in jFeetunitOptions"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </template>
           </el-table-column>
-          <el-table-column
-            prop="fBegindate"
+           <el-table-column
+            prop="fPrice"
             header-align="center"
             align="center"
-            label="录入时间"
+            label="单价"
           >
           </el-table-column>
           <!-- <el-table-column
@@ -1922,7 +1942,7 @@
         />
         <div slot="footer" class="dialog-footer">
           <el-button type="primary" @click="zhgenlegData">导入</el-button>
-          <el-button @click="warehousingagreement = false">取 消</el-button>
+          <el-button @click="warehousingagreements = false">取 消</el-button>
         </div>
       </el-dialog>
        <!-- 选择仓储费协议数据 -->
@@ -1934,7 +1954,7 @@
         width="70%"
       >
         <el-table
-          :data="whgenlegList"
+          :data="tasklegList"
           ref="table"
           tooltip-effect="dark"
           width="100%"
@@ -1942,30 +1962,36 @@
           stripe
           @selection-change="whgenlegSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
           <el-table-column
-            prop="fMblno"
+            prop="fContractno"
             header-align="center"
             align="center"
             label="提单号"
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fCorpid"
             header-align="center"
             align="center"
-            width="180px"
-            label="入库日期"
+            label="客户名称"
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsids"
+            prop="fGoodsid"
             header-align="center"
             align="center"
             label="品名"
           >
           </el-table-column>
           <el-table-column
+            prop="fBegindate"
+            header-align="center"
+            align="center"
+            width="180px"
+            label="入库日期"
+          >
+          </el-table-column>
+          <!-- <el-table-column
             prop="fQtyblc"
             header-align="center"
             align="center"
@@ -1985,7 +2011,7 @@
             align="center"
             label="唛头"
           >
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <pagination
           v-show="whgenlegTotal > 0"
@@ -1995,8 +2021,8 @@
           @pagination="getWhgenlegList"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="whgenlegData">导入</el-button>
-          <el-button @click="whgenlegVisible = false">取 消</el-button>
+          <!-- <el-button type="primary" @click="whgenlegData">导入</el-button> -->
+          <el-button @click="storageAgreement = false">取 消</el-button>
         </div>
       </el-dialog>
        <!-- 选择仓储费协议数据 -->
@@ -2008,7 +2034,7 @@
         width="70%"
       >
         <el-table
-          :data="whgenlegList"
+          :data="tasklegList"
           ref="table"
           tooltip-effect="dark"
           width="100%"
@@ -2016,48 +2042,33 @@
           stripe
           @selection-change="whgenlegSelectionChange"
         >
-          <el-table-column type="selection" width="55"> </el-table-column>
-          <el-table-column
-            prop="fMblno"
+         <el-table-column
+            prop="fContractno"
             header-align="center"
             align="center"
             label="提单号"
           >
           </el-table-column>
           <el-table-column
-            prop="createTime"
+            prop="fCorpid"
             header-align="center"
             align="center"
-            width="180px"
-            label="入库日期"
+            label="客户名称"
           >
           </el-table-column>
           <el-table-column
-            prop="fGoodsids"
+            prop="fGoodsid"
             header-align="center"
             align="center"
             label="品名"
           >
           </el-table-column>
           <el-table-column
-            prop="fQtyblc"
-            header-align="center"
-            align="center"
-            label="结余数量"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="fWarehouseLocationids"
-            header-align="center"
-            align="center"
-            label="库区"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="fMarks"
+            prop="fBegindate"
             header-align="center"
             align="center"
-            label="唛头"
+            width="180px"
+            label="入库日期"
           >
           </el-table-column>
         </el-table>
@@ -2069,8 +2080,8 @@
           @pagination="getWhgenlegList"
         />
         <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="whgenlegData">导入</el-button>
-          <el-button @click="whgenlegVisible = false">取 消</el-button>
+          <!-- <el-button type="primary" @click="whgenlegData">导入</el-button> -->
+          <el-button @click="storageAgreements = false">取 消</el-button>
         </div>
       </el-dialog>
       <el-dialog
@@ -2384,7 +2395,7 @@ import {
   updateWarehousebills,
   exportWarehousebills,
 } from "@/api/warehouseBusiness/warehouseOutStock";
-import { listAgreement } from '@/api/agreement/agreement';
+import { listAgreement,operationAgreement } from '@/api/agreement/agreement';
 
 import { listAgreements } from '@/api/warehouseBusiness/agreement';
 
@@ -2759,7 +2770,7 @@ export default {
       this.whgenlegTotal = 0;
       this.storageAgreements = true;
       // this.whgenlegData()
-      this.getAgreementt();
+      this.getAgreement();
       }
     },
     // 查询仓储费协议
@@ -2778,10 +2789,13 @@ export default {
     },
       // 查询作业费信息
     getWhgenlegListt() {
-      this.queryParams.fCorpid = this.form.fCorpid;
-      listAgreement(this.queryParams).then((response) => {
+      this.queryParams.fLineno = this.form.fCorpid;
+      operationAgreement(this.queryParams).then((response) => {
         console.log(response)
         this.tasklegList = response.rows;
+        for(let li in this.tasklegList) {
+          this.$set(this.tasklegList[li], "fFeeUnitid", this.tasklegList[li].fFeeUnitid + '')
+        }
         console.log(this.whgenlegList);
         this.whgenlegTotal = response.total;
       });
@@ -2790,24 +2804,47 @@ export default {
      // 导入付款信息
     whgenlegDatas() {
       console.log(this.dialogWhgenlegList)
-      for (let whgen in this.dialogWhgenlegList) {
+      if (this.dialogWhgenlegList.length === 0) {
+        this.$message({
+          message: "请选择需要导入的数据",
+          type: "warning",
+        });
+      } else {
+        for (let whgen in this.dialogWhgenlegList) {
         this.warehouseDrList.push({
           fCorpid: this.dialogWhgenlegList[whgen].fCorpid,
-
+          fFeeid: this.dialogWhgenlegList[whgen].feeFId + '',
+          fFeeUnitid: this.dialogWhgenlegList[whgen].fFeeUnitid +'',
+          fUnitprice: this.dialogWhgenlegList[whgen].fPrice,
+          fCurrency: "RMB",
+          fCxrate: "1"
         });
       }
       this.warehousingagreement = false;
+      } 
 
     },
     zhgenlegData () {
        console.log(this.dialogWhgenlegList)
+      if (this.dialogWhgenlegList.length === 0) {
+        this.$message({
+          message: "请选择需要导入的数据",
+          type: "warning",
+        });
+      } else {
       for (let zhgen in this.dialogWhgenlegList) {
         this.warehouseCrList.push({
           fCorpid: this.dialogWhgenlegList[zhgen].fCorpid,
+          fFeeid: this.dialogWhgenlegList[zhgen].feeFId + '',
+          fFeeUnitid: this.dialogWhgenlegList[zhgen].fFeeUnitid +'',
+          fUnitprice: this.dialogWhgenlegList[zhgen].fPrice,
+          fCurrency: "RMB",
+          fCxrate: "1"
 
         });
       }
       this.warehousingagreements = false;
+      }
     },
     // 新增list
     addRelevant() {
@@ -3230,6 +3267,17 @@ export default {
         }
       }
     },
+      // change仓库
+    changefWarehouseid(row) {
+      console.log(this.warehouseOptions)
+      console.log(row)
+        for(let corp in this.warehouseOptions) {
+         if(row.fWarehouseid === this.warehouseOptions[corp].fId) {
+           this.$set(this.form, "fContacts", this.warehouseOptions[corp].createBy);
+           this.$set(this.form, "fTel", this.warehouseOptions[corp].fTotalgross);
+         }
+       }
+    },
     // 选择按钮
     Collectionoptions(selection) {
       console.log(selection);

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.137.73:9010`,
-        // target: `http://engineering.echepei.com:9010/`,
+        // target: `http://192.168.137.73:9010`,
+        target: `http://engineering.echepei.com:9010/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''