更新

src/views/contractManagement/salesContract.vue

@@ -376,7 +376,7 @@
             id: row.id,
             contractNo: row.contractNo,
             status:row.status,
-            buger:row.buger
+            buyer:row.buyer
           },
         })
       },

src/views/contractManagement/salesContractCost.vue

@@ -9,7 +9,7 @@
           <el-option v-for="item in contractList" :key="item.id" :label="item.contractNo+'('+item.status+')'" :value="item.contractNo"
             style="color: #8890b1" />
         </el-select>
-        <span style='padding-left:10px;'>买方：{{buger}}</span>
+        <span style='padding-left:10px;min-width: 235px'>买方：{{buyer}}</span>
       </template>
       <template slot="right">
       </template>
@@ -89,9 +89,9 @@
       </el-table-column>
       <el-table-column width='130' prop="payDeadline" label="支付日期">
       </el-table-column>
-      <el-table-column width='130' prop="createDate" label="录入日期">
+      <el-table-column width='160' prop="createDate" label="录入日期" >
       </el-table-column>
-      <el-table-column width='130' prop="status" label="状态">
+      <el-table-column  prop="status" label="状态">
          <template slot-scope="scope">
            <span v-if='scope.row.approveStatus'>{{scope.row.approveStatus}}</span><span v-else>{{scope.row.status}}</span>
            <i @click="handlerecord(scope.row)" class="el-icon-s-claim"></i>
@@ -256,7 +256,7 @@
         year: '',
         title:'',
         costType:1,
-        buger:'',
+        buyer:'',
         deptBudgetTotal: 0,
         currentPage: 1,
         recordList:[],
@@ -314,7 +314,7 @@
             this.contractId=this.$route.query.id
             this.contractNo=this.$route.query.contractNo
             this.searchTypeText=this.$route.query.contractNo+'('+this.$route.query.status+')'
-            this.buger=this.$route.query.buger
+            this.buyer=this.$route.query.buyer
       getcontract({flag:0}).toPromise()
           .then((response) => {
             this.contractList=response
@@ -424,7 +424,7 @@
             this.contractId=this.contractList[i].id
             this.contractNo=this.contractList[i].contractNo
             this.searchTypeText=this.contractList[i].contractNo
-            this.buger=this.contractList[i].buger
+            this.buyer=this.contractList[i].buyer
             this.getList()
           }
           

src/views/houseSelfCollect/inspectionManagementrecord.vue

@@ -44,7 +44,7 @@
       <el-table-column prop="qualityNo" width="100" label="业务编号"></el-table-column>
       <el-table-column v-if='serviceManagementType==1' prop="qualityNo" width="100" label="合同编号/移库编号">
         <template scope="scope">
-          <span v-if="scope.row.contractNo">0{{ scope.row.contractNo }}</span>
+          <span v-if="scope.row.contractNo">{{ scope.row.contractNo }}</span>
           <span v-else>{{ scope.row.moveTaskNo }}</span>
         </template>
       </el-table-column>

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -894,13 +894,16 @@
               if (this.inWarehouseType == 1) {
                 this.weighingList = this.inOutDate
                 this.weighingList.pictureAddress = response.data.url
+                tare(this.weighingList)
+                .toPromise()
+                .then((response) => {})
+
               } else {
                 this.weighingList.pictureAddress = response.data.url
-              }
-
-              tare(this.weighingList)
+                tare(this.weighingList)
                 .toPromise()
                 .then((response) => {})
+              }
             })
             this.dialogTableVisible = true
           }
@@ -1137,8 +1140,6 @@
                     })
                     .toPromise()
                     .then((response) => {
-                      // let printString = localStorage.getItem('ws-pf_compId') + "," + row.qualityNo + "," + this.cangid
-                      //   getQRcode({printString}).toPromise().then((res) => {
                       this.isShowPrint = true
                       this.inspect = response
                       // this.inspect.qrCodeUrl = res
@@ -1149,11 +1150,9 @@
                       // })
                     })
                     .catch((response) => {
-                      // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
                     })
                 })
                 .catch((response) => {
-                  // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
                 })
             }
           })

src/views/profitable/contractOtherMoney.vue

@@ -74,7 +74,7 @@
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
               <el-button @click="audit(5,scope.row)"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
-              <el-button @click="delData(scope.row)"
+              <el-button @click="delData(scope.row)" v-if="scope.row.status == '已驳回'"
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
               </div>
             </template>