Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/Pricesystem/Price/PriceTrunkLine.vue

@@ -239,14 +239,14 @@
         :loading="details.loadingObj.list"
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作' && !$route.query.Viewdetails">
-            <el-text class="button" @click="() => handleEdit(slotProps.scope)"
+          <template v-if="slotProps.scope.column.label === '操作' ">
+            <el-text class="button"  @click="() => handleEdit(slotProps.scope)"
               ><el-icon>
                 <CirclePlus />
               </el-icon>
-              编 辑
+              {{!$route.query.Viewdetails?'编辑':'查看'}}
             </el-text>
-            <el-text class="button remove" @click="() => handleRemoveLine(slotProps.scope)">
+            <el-text class="button remove" v-if="!$route.query.Viewdetails" @click="() => handleRemoveLine(slotProps.scope)">
               <el-icon>
                 <Delete />
               </el-icon>
@@ -287,6 +287,7 @@
           :options="details.regionOptione"
           style="width: 100%"
           v-model="details.form.startCity"
+          :disabled="$route.query.Viewdetails"
           filterable
           :props="{
             checkStrictly: true,
@@ -306,6 +307,7 @@
           pleceholder="请选择目的地"
           :options="details.regionOptione"
           style="width: 100%"
+          :disabled="$route.query.Viewdetails"
           :props="{
             checkStrictly: true,
           }"
@@ -325,6 +327,7 @@
         label="发货单位"
         prop="sendOrg"
         :rules="[{ required: true, message: '请选择发货单位', trigger: ['blur', 'change'] }]"
+        
       >
         <el-select
           class="w100"
@@ -332,6 +335,7 @@
           filterable
           clearable
           placeholder="请选择发货单位"
+          :disabled="$route.query.Viewdetails"
           style="width: 240px"
           :loading="details.loadingObj.loading"
           @change="
@@ -379,6 +383,7 @@
                 clearable
                 placeholder="请选择车型"
                 @change="handleCheckVehicleType"
+                :disabled="$route.query.Viewdetails"
               >
                 <el-option
                   v-for="item in details.vehicleTypeArr"
@@ -395,6 +400,7 @@
                 v-model="value.price"
                 :controls="false"
                 :precision="2"
+                :disabled="$route.query.Viewdetails"
                 :value-on-clear="0"
                 :min="0"
               />
@@ -446,6 +452,7 @@
                   :controls="false"
                   :precision="2"
                   :value-on-clear="0"
+                  :disabled="$route.query.Viewdetails"
                   :min="0"
                 />
               </div>
@@ -478,6 +485,7 @@
                           style="width: 100%"
                           :controls="false"
                           :precision="2"
+                          :disabled="$route.query.Viewdetails"
                           :value-on-clear="0"
                           :min="0"
                         />
@@ -512,6 +520,7 @@
             style="width: 13vw"
             :controls="false"
             :value-on-clear="0"
+            :disabled="$route.query.Viewdetails"
             :min="0"
           />
         </el-form-item>
@@ -526,6 +535,7 @@
             style="width: 13vw"
             :controls="false"
             :value-on-clear="0"
+            :disabled="$route.query.Viewdetails"
             :min="0"
           />
         </el-form-item>

src/views/aftersales/aftersalesWorkOrder.vue

@@ -331,11 +331,11 @@
                         > -->
 
                         <!-- 理赔金额确定 -->
-                        <el-button
+                        <!-- <el-button
                           v-if="TabPermissions == '4' && UserPermissions == '仓库客服'"
                           @click="DetermineClaims(slotProps.scope)"
                           >确定理赔金额</el-button
-                        >
+                        > -->
 
                         <el-button
                           v-if="AppealStatusT && slotProps.scope.row.typesOf == '3'"

src/views/basicdata/brand/basicClient.vue

@@ -219,7 +219,7 @@
         <div v-loading="loadingObj.submitLoading">
           <el-form :disabled="view" ref="form" :model="form" :rules="rules" label-width="120px">
             <!-- 表单字段 -->
-            <el-form-item label="客户编码" prop="clientCode">
+            <el-form-item label="客户编码">
               
               <!-- :validate-method="validateInput" -->
               

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -583,7 +583,7 @@
     <!-- 选择包件 -->
     <!-- 此v-if解决关闭后选择不回显的问题 -->
 
-      <el-dialog v-if="dialogChooseOrderVisible" v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%;">
+      <el-dialog v-show="dialogChooseOrderVisible" v-model="dialogChooseOrderVisible" title="选择包件" center style="width: 80%;">
         <tablecmt
           ref="orderChooseTable"
           class="orderChooseTable"
@@ -2653,7 +2653,7 @@ export default {
       console.log( this.dataList.find(val => val.id === this.orderChooseId),' this.dataList.find(val => val.id === this.orderChooseId)筛选出来的');
     },
     ProhibitSelection(val, index) {
-      if (val.orderPackageStatus == 70) {
+      if (val.orderPackageStatus == '已签收' || val.orderPackageStatus == '70') {
         return false;
       } else {
         return true;