费用修改带出数据，echarts版本升级

src/main.js

@@ -22,9 +22,10 @@ import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels,
 import Pagination from "@/components/Pagination";
 //自定义表格工具扩展
 import RightToolbar from "@/components/RightToolbar"
-import echarts from "echarts";
+import * as echarts from "echarts";
 import '@/utils/dialog.js'
 import {toSuperFixed} from "./api/warehouseBusiness/restructure";
+
 // 解决浮点数的问题
 import _ from 'lodash';
 

src/views/Warehousing/cargoClearance/AddOrUpdate.vue

@@ -1213,6 +1213,7 @@
                 filterable
                 placeholder="费用名称"
                 :disabled="browseStatus || scope.row.fBillstatus === 6"
+                @change="feeChoice(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -1604,6 +1605,7 @@
                 filterable
                 placeholder="费用名称"
                 :disabled="browseStatus || scope.row.fBillstatus === 6"
+                @change="feeChoice(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fCNameOptions"
@@ -5171,6 +5173,12 @@ export default {
         }
       })
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/components/incomeMoney.vue

@@ -170,6 +170,7 @@
               filterable
               placeholder="费用名称"
               :disabled="browseStatus || scope.row.fBillstatus == 6"
+              @change="feeChoice(scope.row)"
             >
               <el-option
                 v-for="(item, index) in fDNameOptions"
@@ -1032,6 +1033,7 @@ import {
   listWarehousesss,
   deliveryDetails
 } from "@/api/basicdata/warehouse";
+import { getFees } from "@/api/basicdata/fees";
 
 export default {
   props: {
@@ -1713,6 +1715,12 @@ export default {
           break;
       }
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
 
     //列设置全选
     allChecked() {

src/views/Warehousing/components/payMoney.vue

@@ -172,6 +172,7 @@
               filterable
               placeholder="费用名称"
               :disabled="browseStatus || scope.row.fBillstatus == 6"
+              @change="feeChoice(scope.row)"
             >
               <el-option
                 v-for="(item, index) in fCNameOptions"
@@ -989,6 +990,7 @@ import {
   listWarehousesss,
   deliveryDetails
 } from "@/api/basicdata/warehouse";
+import { getFees } from "@/api/basicdata/fees";
 
 export default {
   name: 'payMoney',
@@ -1645,6 +1647,12 @@ export default {
         this.$message.error("请选择需要打印的明细!");
       }
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
 
     //列设置全选
     allChecked() {

src/views/Warehousing/components/upLoad.vue

@@ -44,6 +44,28 @@
         </template>
       </el-table-column>
       <el-table-column
+        prop="fType"
+        header-align="center"
+        align="center"
+        label="文件属性">
+        <template slot-scope="scope">
+          <el-select
+            v-model="scope.row.fType"
+            clearable
+            filterable
+            :disabled="browseStatus"
+            @change="filesTypeChange(scope.row)"
+          >
+            <el-option
+              v-for="(item, index) in filesTypeOptions"
+              :value="item.dictValue"
+              :label="item.dictLabel"
+              :key="index"
+            ></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column
         prop="createBy"
         header-align="center"
         align="center"
@@ -174,8 +196,15 @@ export default {
         Authorization: "Bearer " + getToken(),
       },
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
+      filesTypeOptions: [],
+      repeatData: '', //判断文件属性是否有重复
     };
   },
+  created() {
+    this.getDicts("file_type").then((response) => {
+      this.filesTypeOptions = response.data;
+    });
+  },
   methods: {
     // 新增附件上传
     addRelevt() {
@@ -215,11 +244,23 @@ export default {
       } else {
         this.$message.error("请上传附件");
       }
-    }
+    },
+    // 文件属性上传判断
+    filesTypeChange(row) {
+      if (row.fType == 1) {
+        let repeat = false
+        for (let k = 0;k < this.relevantAttachments.length - 1;k++) {
+          if (row.fType == this.relevantAttachments[k].fType) repeat = true
+        }
+        if (repeat) {
+          row.fType = null
+          this.$message.warning('已存在电子签章')
+        }
+      }
+    },
   },
   watch: {
     relevantAttachments(val) {
-      console.log(val);
       this.relevantAttachments = val;
     },
     createBy(val){

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -744,6 +744,7 @@
                 filterable
                 placeholder="费用名称"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
+                @change="feeChoice(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -1127,7 +1128,8 @@
                 clearable
                 filterable
                 placeholder="费用名称"
-                :disabled="browseStatus || scope.row.fBillstatus == 6">
+                :disabled="browseStatus || scope.row.fBillstatus == 6"
+                @change="feeChoice(scope.row)">
                 <el-option
                   v-for="(item, index) in fCNameOptions"
                   :key="index.fId"
@@ -4765,6 +4767,12 @@ export default {
         }
       }
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/inAndOutStock/AddOrUpdate.vue

@@ -2151,6 +2151,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
+                  @change="feeChoice(scope.row)"
                   :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
@@ -2699,6 +2700,7 @@
                   clearable
                   filterable
                   placeholder="费用名称"
+                  @change="feeChoice(scope.row)"
                   :disabled="browseStatus || scope.row.fBillstatus == 6 || form.warehouseStatus > 3"
               >
                 <el-option
@@ -7937,6 +7939,12 @@ export default {
         }
       })
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
   },
   watch: {
     // 监听 addOrUpdateVisible 改变

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -2253,7 +2253,7 @@
     >
       <el-radio v-model="radio" :label="1">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
-      <div id="print_area4" class="print-div">
+      <div id="print_area4" class="print-div" style="position: relative;">
         <div
             class="print-title"
             style="
@@ -2268,8 +2268,8 @@
         <div style="display: flex;justify-content: flex-end">
           <div>制单人：{{ form.createBy }}</div>
         </div>
-        <div class="print_table" style="display: flex">
-          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
+        <div class="print_table" style="display: flex;z-index: 10">
+          <table ref="printTable" border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px;" :style="{'background': 'url(' + signature + ') bottom right no-repeat'}">
             <tr>
               <td>客户名称</td>
               <td>{{ form.fCorpidName }}</td>
@@ -2329,9 +2329,10 @@
               <td colspan="2">{{ allfQty }}</td>
             </tr>
           </table>
+
         </div>
         <div
-            style="display: flex; justify-content: space-between; font-size: 12px"
+            style="display: flex; justify-content: space-between; font-size: 12px;z-index: 10"
         >
           <div>操作：</div>
           <div>理货：</div>
@@ -2339,7 +2340,11 @@
           <div>司机：</div>
 
           <div style="width: 150px">电话：</div>
+
         </div>
+<!--        <div style="width: 150px;z-index: -1;opacity: 0.6;margin-top: -150px;float: right">-->
+<!--          <img :src="signature" width="100%">-->
+<!--        </div>-->
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button
@@ -6760,6 +6765,7 @@ export default {
       },
       noUploadVisible: false, //上传弹窗
       bigDataToken: null,
+      signature: null, //打印时候的电子签章
     };
   },
   created() {
@@ -6904,6 +6910,9 @@ export default {
     this.queryUser();
     this.getRow();
   },
+  mounted() {
+    this.$refs.printTable.style.setProperty('--url', 'url(' + this.signature + ') bottom right no-repeat')
+  },
   activated() {
     this.getDicts("st_in_type").then((response) => {
       this.businessTypeOption = response.data;
@@ -9443,6 +9452,8 @@ export default {
     changePrint() {
       if (this.form.fCompany) {
         getCorps(this.form.fCompany).then(res => {
+          const uploadList = res.data.attach? res.data.attach: []
+          this.signature = typeof (uploadList.find(item => item.fType == '1')) == 'undefined'? null: uploadList.find(item => item.fType == '1').fUrl;
           this.fCompanyName = res.data.corp.fName
           this.printFeeConfirm.fAddr = res.data.corp.fAddr
           this.printFeeConfirm.fTel = res.data.corp.fTel
@@ -9612,4 +9623,8 @@ export default {
 .print_form {
   font-size: 12px;
 }
+//.print_table table::after {
+//  content: '';
+//  background: var(--url);
+//}
 </style>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -1360,6 +1360,7 @@
                   filterable
                   placeholder="费用名称"
                   :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  @change="feeChoice(scope.row)"
                 >
                   <el-option
                     v-for="(item, index) in fDNameOptions"
@@ -2179,6 +2180,7 @@
                   filterable
                   placeholder="费用名称"
                   :disabled="browseStatus || scope.row.fBillstatus == 6"
+                  @change="feeChoice(scope.row)"
                 >
                   <el-option
                     v-for="(item, index) in fCNameOptions"
@@ -4251,20 +4253,19 @@
 
         <div
             style="
-            display: flex;
-            justify-content: center;
-            margin-left: 350px;
             margin-bottom: 5px;
+            width: 100%;
+            position: relative;
           "
         >
-          <div style="font-size: 18px">出&nbsp;库&nbsp;单</div>
-          <div style="margin-left: 200px">
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
             <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
           </div>
         </div>
-        <div style="display: flex; margin-bottom: 5px">
+        <div style="display: flex;justify-content: space-between; margin-bottom: 5px">
           <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
-          <div style="margin-left: 250px">存放地点：{{ stockName }}</div>
+          <div>存放地点：{{ stockName }}</div>
         </div>
         <div class="print_table" style="display: flex">
           <table
@@ -4274,8 +4275,8 @@
               style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名</td>
-              <td colspan="3">{{ form.fProductName }}</td>
+              <td>品名 / 属性详情</td>
+              <td colspan="3">{{ form.fProductName }} / {{ form.fMarks }}</td>
               <td colspan="3">清单号</td>
               <td colspan="3">{{ form.fCustomsdeclartion }}</td>
             </tr>
@@ -5953,6 +5954,8 @@ export default {
     this.queryUser();
     this.getRow();
     this.getRow2();
+    this.getRow3();
+    this.getRow4();
   },
   activated() {
     this.getDicts("st_out_type").then((response) => {
@@ -9299,6 +9302,8 @@ export default {
     changePrint() {
       if (this.form.fCompany) {
         getCorps(this.form.fCompany).then(res => {
+          const uploadList = res.data.attach? res.data.attach: []
+          this.signature = typeof (uploadList.find(item => item.fType == '1')) == 'undefined'? null: uploadList.find(item => item.fType == '1').fUrl;
           this.fCompanyName = res.data.corp.fName
           this.printFeeConfirm.fAddr = res.data.corp.fAddr
           this.printFeeConfirm.fTel = res.data.corp.fTel
@@ -9317,6 +9322,12 @@ export default {
         }
       }
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
 
     //列设置全选
     allChecked3() {

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -1570,6 +1570,7 @@
                 filterable
                 placeholder="费用名称"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
+                @change="feeChoice(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fDNameOptions"
@@ -1997,6 +1998,7 @@
                 filterable
                 placeholder="费用名称"
                 :disabled="browseStatus || scope.row.fBillstatus == 6"
+                @change="feeChoice(scope.row)"
               >
                 <el-option
                   v-for="(item, index) in fCNameOptions"
@@ -6274,6 +6276,12 @@ export default {
         );
       }
     },
+    feeChoice(row) {
+      getFees(row.fFeeid).then(res => {
+        row.fFeeUnitid = (res.data.fFeeunitid).toString()
+        this.changeFeeUnit(row)
+      })
+    },
     updateDeduplication() {
       if (this.detailList.length) {
         let fMarks = [];

src/views/finance/contrast/index.vue

@@ -104,7 +104,7 @@
                 <el-form-item label="业务编号" prop="fBillno">
                   <el-input
                     v-model="tablefilter.fBillno"
-                    placeholder="请输入备注"
+                    placeholder="请输入业务编号"
                     clearable
                     style="width: 100%"
                     @keyup.enter.native="handleQuery"
@@ -1307,6 +1307,11 @@
                   </el-select>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="业务编号">
+                  <el-input  v-model="TWareHouseFees.fBillno" placeholder="业务编号" clearable />
+                </el-form-item>
+              </el-col>
             </el-row>
             <div style="margin-right: 20px; float: right">
               <el-button type="cyan" size="mini" @click="searchFee(typevalue)"
@@ -1517,9 +1522,18 @@
                   <span v-if="item.label == 'fFeeName'">{{
                     scope.row.fFeeName
                   }}</span>
+                  <span v-if="item.label == 'fBillno'">{{
+                      scope.row.fBillno
+                    }}</span>
+                  <el-input
+                    v-model="scope.row.invoiceNo"
+                    v-if="item.label == 'invoiceNo'"
+                    placeholder="请输入发票号"
+                  />
                   <el-input
                     v-model="scope.row.fRemarks"
                     v-if="item.label == 'fRemarks'"
+                    placeholder="请输入备注"
                   />
                 </template>
               </el-table-column>
@@ -2141,13 +2155,27 @@ export default {
         },
         {
           surface: "19",
+          label: "fSrcBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "20",
+          label: "fInvoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "21",
           label: "fRemarks",
           name: "备注",
           checked: 0,
           width: 100,
         },
         {
-          surface: "20",
+          surface: "22",
           label: "carLoadDate",
           name: "提箱日期",
           checked: 0,
@@ -2234,6 +2262,20 @@ export default {
         },
         {
           surface: "12",
+          label: "fBillno",
+          name: "业务编号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "13",
+          label: "invoiceNo",
+          name: "发票号",
+          checked: 0,
+          width: 120,
+        },
+        {
+          surface: "14",
           label: "fRemarks",
           name: "备注",
           checked: 0,
@@ -3688,6 +3730,8 @@ export default {
         this.pass.fAmtdr = Number(this.pass.fAmtdr);
         this.pass.fAmtcr += Number(this.selection[item].fAmt);
         this.pass.fAmtdr += Number(this.selection[item].fAmtdr);
+        this.$set(this.selection[item], 'fSrcBillno', this.selection[item].fBillno);
+        this.$set(this.selection[item], 'fInvoiceNo', this.selection[item].invoiceNo);
       }
       // this.pass.fAmtcr.toFixed(2);
       if (this.state_s == true) {

src/views/reportManagement/Statistics/index.vue

@@ -670,7 +670,28 @@ export default {
           name: "净重(kg)",
           checked: 0,
           width: 100,
-        }
+        },
+        {
+          surface: "9",
+          label: "fDrivername",
+          name: "司机",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fTruckno",
+          name: "车号",
+          checked: 0,
+          width: 100,
+        },
+        {
+          surface: "9",
+          label: "fDriverIdCar",
+          name: "司机身份证",
+          checked: 0,
+          width: 120,
+        },
       ],
       allCheck: false,
     };