zxz 2 vuotta sitten
vanhempi
commit
ccfe451b89

+ 5 - 3
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1321,7 +1321,7 @@ export default {
             .toPromise()
             .then((response) => {
               if (response) {
-                this.$set(this.deptBudgetList, "dryGrainPrice", response)
+                this.$set(this.deptBudgetList, 'dryGrainPrice', response)
                 // this.deptBudgetList.dryGrainPrice = response
                 this.dryGrainPrice = response
               }
@@ -3372,6 +3372,7 @@ export default {
                           console.log(response)
                           // this.$message.warning(response)
                         })
+                        this.$forceUpdate()
                     } else {
                       this.deptBudgetList.id = zjid
                       // if (this.serviceManagementType==3) {
@@ -3426,6 +3427,7 @@ export default {
                               // this.$message.warning(response)
                             })
                           this.getList()
+                          this.$forceUpdate()  
                           this.selectWarehouse()
                           this.add()
                         })
@@ -4012,8 +4014,8 @@ export default {
           })
       }
       if (this.deptBudgetList.goodsName == '大豆') {
-        this.deptBudgetList.transgene = "非转基因"
-        this.deptBudgetList.colorLustre = "正常"
+        this.deptBudgetList.transgene = '非转基因'
+        this.deptBudgetList.colorLustre = '正常'
       } else {
         delete this.deptBudgetList.transgene
         delete this.deptBudgetList.colorLustre

+ 1 - 1
src/views/personnelManagement/component/router/route.js

@@ -19,7 +19,7 @@ const checkWorkListRouter = {
             meta: {
                 title: '考勤管理',
                 shortcutEntrance: 'checkWorkList',
-                module: 'customerManagement.customer.customerInfo',
+                // module: 'customerManagement.customer.customerInfo',
                 permissicon: [],
                 keepAlive: true,
                 // module: 'procurement.sparepart.applDetail'

+ 9 - 2
src/views/profitable/contractprofitsdetails.vue

@@ -134,7 +134,10 @@
             <td class="col">{{tableData.seller}}</td>
           </tr>
           <tr class="row">
-            <td class="col col-bgc">结算单价(元/吨)</td>
+            <td class="col col-bgc"> 
+              <span v-if="tableData.agreementType == '采购合同'">采购</span>
+              <span v-if="tableData.agreementType == '收购合同'">收购</span>
+              <span v-if="tableData.agreementType == '销售合同'">销售</span>结算单价(元/吨)</td>
             <td class="col">{{tableData.settlementPrice}}</td>
             <td class="col col-bgc">合计利润(元)</td>
             <td class="col">{{tableData.profit}}</td>
@@ -146,7 +149,11 @@
             <td class="col col-bgc">利润(元)</td>
           </tr>
           <tr v-for="item in tableData.contractList" class="row">
-            <td class="col">{{item.contractNo}}</td>
+            <td class="col">{{item.contractNo}}
+              <span v-if="item.agreementType == '采购合同'">(采购)</span>
+              <span v-if="item.agreementType == '收购合同'">(收购)</span>
+              <span v-if="item.agreementType == '销售合同'">(销售)</span>
+            </td>
             <td class="col">{{item.settlementPrice}}</td>
             <td class="col">{{item.weight}}</td>
             <td class="col">{{item.profit}}</td>