Merge branch 'dev' of http://git.echepei.com/zhujiawei/Warehouse_management_ui into dev

src/views/reportManagement/profitGeneralLedger/index.vue

@@ -199,6 +199,21 @@
             :value="item.fId"/>
         </el-select>
       </el-form-item>
+      <el-form-item label="业务员" prop="fSalesmanId">
+        <el-select
+          v-model="queryParams.fSalesmanId"
+          clearable
+          filterable
+          placeholder="请选择业务员"
+        >
+          <el-option
+            v-for="(item, index) in fSalesmanOption"
+            :key="index.userId"
+            :label="item.userName"
+            :value="item.userId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
 
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -386,6 +401,7 @@ import { getVoyageName } from '@/api/finance/applyForInvoice/feeDetail';
 import {
   getFName,
 } from '@/api/kaihe/domesticTrade/orderInformation'
+import {selectUserByRole} from "@/api/basicdata/warehouse"
 
 export default {
   name: 'profitGeneralLedger',
@@ -426,6 +442,7 @@ export default {
       businessOutTypeOption:[],
       businessTransTypeOption:[],
       businessTypeOption: [],
+      fSalesmanOption: [],
       // 货权方(客户数据)
       fMblnoOptions: [],
       // 贸易方式(数据字典),对应t_trademodels 字典
@@ -538,13 +555,6 @@ export default {
           checked: 0,
           width: 120,
         },
-        {
-          surface: "10",
-          label: "salesmanName",
-          name: "业务员",
-          checked: 0,
-          width: 120,
-        },
       ],
       allCheck: false,
       // 船名
@@ -645,6 +655,10 @@ export default {
     getFName(queryParams).then(response => {
       this.nameOptions = response.data
     })
+    // 业务员获取
+    selectUserByRole().then(res => {
+      this.fSalesmanOption = res.rows
+    })
     this.getDicts('data_unitfees').then((response) => {
       if (response.data) {
         this.jFeetunitOptions = response.data
@@ -764,9 +778,9 @@ export default {
             sums[index] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
-                return prev + curr
+                return (Number(prev) + Number(curr)).toFixed(2)
               } else {
-                return prev
+                return Number(prev).toFixed(2)
               }
             }, 0)
           }

src/views/warehouseBusiness/agreement/index.vue

@@ -1018,12 +1018,17 @@ export default {
     check_s(row, res) {
       this.notChange = true
       this.browseStatus = true
+      this.relevantAttachments = []
       this.register()
       getAgreement(row.fId).then(response => {
         // this.$set(this,'fMblnoOptions',response.data.corps)
         this.deptName = response.data.dept.deptName
         this.form = response.data.tWarehouseAgreement
-        this.relevantAttachments = response.data.attachList
+        if (response.data.attachList) {
+          this.relevantAttachments = response.data.attachList
+        } else {
+          this.relevantAttachments = []
+        }
         if (response.data.tWarehouseAgreement.tPackages) {
           // this.form.tPackages = this.form.tPackages
           //   .replace(/\[|]/g, "")
@@ -1126,6 +1131,7 @@ export default {
           let formData = new window.FormData()
           formData.append('agreement', JSON.stringify(this.form))
           formData.append('agreementitems', JSON.stringify(this.agreementitemsList))
+          formData.append('attachments', JSON.stringify(this.relevantAttachments))
           PleaseCheck(formData).then(response => {
             this.msgSuccess('请核成功')
             this.open = false
@@ -1360,6 +1366,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row,num) {
+      this.relevantAttachments = []
       if (num === 2){
         this.notChange = false
         getAgreement(this.idCopy).then(response => {
@@ -1405,7 +1412,12 @@ export default {
           }
           // this.fMblnoOptions = response.data.corps
           this.agreementitemsList = response.data.tWarehouseAgreementitems
-          this.relevantAttachments = response.data.attachList
+          if (response.data.attachList) {
+            this.relevantAttachments = response.data.attachList
+          } else {
+            this.relevantAttachments = []
+          }
+
           for (let item in this.agreementitemsList) {
             this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
             // this.fWRemoteMethod(this.agreementitemsList[item].fFeeid)