Explorar o código

移库出库和自运类型只可选择,不能手动输入

gjy %!s(int64=2) %!d(string=hai) anos
pai
achega
94a49b4221

+ 20 - 7
src/views/outboundManagement/weighingManagementNew.vue

@@ -156,14 +156,14 @@
                       weighingList.outType == '汽运' ||
                       weighingList.outType == '集装箱船'
                     ">
-                        <el-input :maxlength="'7'" v-if="carstatus || carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+                        <el-input :maxlength="'7'" v-if="carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
                            size="small" :disabled="recheck1"/>
                         <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange" :disabled="recheck1">
                           <el-option v-for="item in options2" :key="item.constKey"
                             :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
                         </el-select>
-                        <el-button type="primary" @click="carNoTypeChange" v-if="!carstatus">{{ carChange1 }}</el-button>
+                        <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{ carChange1 }}</el-button>
                       </ws-form-item>
                       <ws-form-item label="箱号-1" span="1" prop="boxNo" v-if="
                       weighingList.outType == '汽运' ||
@@ -1052,7 +1052,6 @@
               this.recheckPrice = false
             }
 
-            this.carstatus=false
             // this.weighingList.carNo =
               // response.qualityInspectionManagement.carNumber
         this.$set(this.weighingList,'carNo', response.qualityInspectionManagement.carNumber)
@@ -2026,7 +2025,13 @@
               }else{
                 this.recheckPrice = false
               }
-              
+              if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+              } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+              }
             }else{
               this.carjudge=true
               if (this.taskNolist[i].contractNo) {
@@ -2143,19 +2148,27 @@
               this.weighingList.inOutTypeKey = 6
             }
             if (this.outContractNo[i].deliverType == '1') {
-              this.carstatus = true
+              this.carjudge = false
+              
             } else {
-              this.carstatus = false
+              this.carjudge = true
             }
             if (this.outContractNo[i].tranCarInfoList) {
               this.options2 = this.outContractNo[i].tranCarInfoList
               this.tranCarInfoList = this.outContractNo[i].tranCarInfoList
-              this.carstatus = true
+              this.carjudge = false
 
             }
             if (this.outContractNo[i].tranCarInfoList1) {
               this.fleetNameList = this.outContractNo[i].tranCarInfoList1
             }
+            if (this.carjudge) {
+                this.weighingList.selfLoading = '1'
+                this.carChange1 = '识别下拉'
+              } else {
+                this.weighingList.selfLoading = '0'
+                this.carChange1 = '手动填写'
+              }
           }
         }
         

+ 1 - 1
src/views/taskManagement/tranManagementWarehouseInOutTask.vue

@@ -133,7 +133,7 @@
 
             <span class="corles" v-hasPermission="
                 `warehouseManagement.warehouse.warehouseInfoTask.delete`
-              " v-if="scope.row.taskId == null" @click="deleteclick(scope.row)">删除</span>
+              " v-if="!scope.row.approveStatus" @click="deleteclick(scope.row)">删除</span>
           </template>
         </el-table-column>
       </el-table>