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

src/views/finance/contrast/index.vue

@@ -213,8 +213,8 @@
         </template>
       </el-table-column>
       <el-table-column label="提单号" align="center" prop="tMblno" />
-      <el-table-column label="应收合计" align="center" prop="fAmtdr" />
-      <el-table-column label="应付合计" align="center" prop="fAmtcr" />
+      <el-table-column label="应收金额" align="center" prop="fAmtdr" />
+      <el-table-column label="应付金额" align="center" prop="fAmtcr" />
       <!--       <el-table-column label="单据类型" align="center" prop="fBilltype" />-->
       <el-table-column label="备注" align="center" show-overflow-tooltip prop="fRemarks" />
       <el-table-column label="状态" align="center" prop="fBillstatus">
@@ -435,7 +435,6 @@
         </el-form-item> -->
 
           <el-form-item
-            class="el-form-item__label"
             label="货权方"
             prop="fCorpid"
           >
@@ -529,7 +528,7 @@
 
           <el-form-item label="审核日期" prop="timeExamine">
             <el-date-picker
-              style="width: 200px"
+              style="width: 250px"
               size="small"
               v-model="TWareHouseFees.timeExamine"
               type="daterange"
@@ -1120,16 +1119,20 @@ export default {
             if(item >= 1){
 
               this.pass.fMblno = this.selection[item].fMblno + "..."
-              this.pass.fName = this.selection[item].fName + "..."
+              // this.pass.fName = this.selection[item].fName + "..."
+              this.pass.fFeesName = this.selection[item].fFeesName + "..."
             }else if(item == 0){
               this.pass.fMblno = this.selection[item].fMblno
-              this.pass.fName = this.selection[item].fName
+              // this.pass.fName = this.selection[item].fName
+              this.pass.fFeesName = this.selection[item].fFeesName + "..."
             }
           }
           console.log(this.pass)
         this.DzfeeList = this.selection
         this.queryParams.tMblno = this.pass.fMblno //提单号
-        this.queryParams.fCtrlcorpid = this.pass.fName
+        // this.queryParams.fCtrlcorpid = this.pass.fName
+
+        this.queryParams.fCorpid = this.pass.fFeesName
         this.queryParams.fAmtcr = this.pass.fAmtcr
         this.queryParams.fAmtdr = this.pass.fAmtdr
         console.log(this.TWareHouseFees)

vue.config.js

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