修改问题ac

src/views/houseSelfCollect/inspectInfo.vue

@@ -73,7 +73,7 @@
           <ws-info-table>
             <ws-form-item label="等级" span="1" prop="grade">
               <ws-select v-model="inspect.grade" placeholder="请输入等级" class="typeselect"
-                :disabled="disabled">
+                :disabled="disabled" @change="waterContentChange">
                 <ws-option v-for="item in gradeList" :key="item.constKey" :label="item.constValue"
                   :value="item.constValue" />
               </ws-select>
@@ -84,7 +84,7 @@
             </ws-form-item>
             <ws-form-item label="水分（%）" span="1" prop="waterContent">
               <ws-input v-model="inspect.waterContent" placeholder="请输入水分占比" maxlength="100" size="small"
-                @change="waterContentChange" :disabled="disabled" />
+                @change="waterContentChange('water')" :disabled="disabled" />
             </ws-form-item>
             <ws-form-item label="霉变粒（%）" span="1" prop="mildewGrain">
               <ws-input v-model="inspect.mildewGrain" placeholder="请输入霉变粒占比" maxlength="100" size="small"
@@ -626,14 +626,7 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0)&&this.tipFlag) {
                   this.tipFlag = false
-                    this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
-                          '提示',
-                          {
-                            confirmButtonText: '确定',
-                            callback: (action) => {
-                            },
-                          }
-                        )
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }
@@ -641,8 +634,8 @@
         }
       },
 
-      waterContentChange() {
-        if (this.inspect.goodsName) {
+      waterContentChange(type) {
+        if (this.inspect.goodsName&&type!='water') {
           for (var i = 0; i < this.purchasePriceList.length; i++) {
             if (this.purchasePriceList[i].goodsName == this.inspect.goodsName) {
               this.$set(this.inspect,'buckleWeightRatio',this.purchasePriceList[i].deductWeight)
@@ -701,20 +694,12 @@
               if (this.inspect.goodsName == this.purchasePriceList[i].goodsName) {
                 if ((this.purchasePriceList[i].saleLimit - response/1000 < 50 || count > 0 )&&this.tipFlag) {
                   this.tipFlag = false
-                    this.$alert('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。',
-                          '提示',
-                          {
-                            confirmButtonText: '确定',
-                            callback: (action) => {
-                            },
-                          }
-                        )
+                  this.$message('当前客户已累计销售我司' +this.inspect.goodsName + (response/1000).toFixed(2) +'吨，最高可售' +this.purchasePriceList[i].saleLimit +'吨。');
                 }
               }
             }
           })
         }
-        
         }
       },
 

src/views/houseSelfCollect/paymentManagement.vue

@@ -120,7 +120,7 @@
             v-hasPermission="`acquisitionManagement.acquisitionPay.view`"
           >查看</el-button>
           <el-button
-            v-show=" scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction "
+            v-show="(scope.row.approveStatus || scope.row.status == '已驳回' || userJurisdiction)&&scope.row.status != '待结算'"
             @click="print(scope.row)"
             v-hasPermission="`acquisitionManagement.acquisitionPay.print`"
           >打印</el-button>

src/views/houseSelfCollect/settlement.vue

@@ -460,7 +460,6 @@ export default {
         let dataURL = canvas.toDataURL('image/png')
         this.imgUrl = dataURL
         if (this.imgUrl !== '') {
-          debugger
           let b = this.dataURLtoFile(this.imgUrl, 'printImage')
           let formdata = new FormData()
           formdata.append('file', b)

src/views/taskManagement/inOutWarehouseTaskEdit.vue

@@ -1,6 +1,7 @@
 // 查看出入库任务
 <template>
   <div class="container">
+           {{dataList}}
     <el-row>
       <el-col :span="12">
         <h2 class="bg-left title">查看出入库任务</h2>
@@ -77,6 +78,9 @@
               :label="item.contractNo"
               :value="item.contractNo"
             ></el-option> -->
+            
+            {{dataList.moveTaskNo}}
+            {{dataList.contractNo}}
             <div v-if="dataList.inOutType == '移库入库' || dataList.inOutType == '移库出库'">  {{dataList.moveTaskNo}}</div>
             <div v-if="dataList.inOutType != '移库入库' || dataList.inOutType != '移库出库'">  {{dataList.contractNo}}</div>
             <!-- </el-select> -->
@@ -648,6 +652,7 @@ export default {
           } else {
             if(response[0].taskTypeKey == 2){
               this.dataList.taskTypeKey=response[0].taskTypeKey
+               this.dataList = response[0]
               this.dataList.inOutType=response[0].inOutType
               this.dataList1 = response[0]
             }else{

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -1102,10 +1102,11 @@ export default {
                 this.deletetask=true
                 this.dataList1.inOutTaskNo='YKR'+response[0].inOutTaskNo.substr(response[0].inOutTaskNo.indexOf('C') + 1,response[0].inOutTaskNo.length)
               }
+              this.dataList = response[0]
               if(response[0].taskTypeKey==2){
                 this.dataList1 = response[0]
               }else{
-                this.dataList = response[0]
+                // this.dataList = response[0]
               }
             }
           })

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -782,8 +782,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
-  height: 87vh;
-  overflow: scroll;
+  // height: 87vh;
+  // overflow: scroll;
   .ws-info-table {
     border: none;
   }