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

src/option/warehouse/warehouseWarehousingDetail.js

@@ -123,6 +123,16 @@ export default {
       prop: "createInventory",
       search: true,
     },
+    {
+      label: "库位名称",
+      prop: "allocationName",
+      search: true,
+    },
+    {
+      label: "托盘名称",
+      prop: "trayName",
+      search: true,
+    },
     // {
     //   label: "实际入库数量",
     //   prop: "actualReceipt",

src/store/index.js

@@ -5,6 +5,7 @@ import tags from './modules/tags';
 import logs from './modules/logs';
 import dict from './modules/dict';
 import isRefresh from './modules/isRefresh';
+import Customer from './modules/Customer';
 import getters from './getters';
 
 const store = createStore({
@@ -15,6 +16,7 @@ const store = createStore({
     tags,
     dict,
     isRefresh,
+    Customer,
   },
   getters,
 });

src/store/modules/Customer.js

@@ -0,0 +1,18 @@
+import { setStore, getStore } from 'utils/store';
+const Customer = {
+  state: {
+    Customerobj:0,
+  },
+  mutations: {
+    /**
+     * 刷新页面菜单
+     * @param {*} state
+     * @param {Number} payload 菜单编号
+     */
+    Customer_Menu: (state, payload) => {
+      state.Customerobj =payload || 0 ;
+      console.log( state.Customerobj,'vuex里面的数据');
+    },
+  },
+};
+export default Customer;

src/views/Pricesystem/ListOfPriceSystems.vue

@@ -175,7 +175,6 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="dialogTemp = false">关闭</el-button>
-        <el-button type="primary" @click="dialogVisible"> 确定 </el-button>
       </div>
     </template>
   </el-dialog>
@@ -325,6 +324,7 @@ const handleSuccess = res => {
       message: res.msg,
       type: 'success',
     });
+    onLoad();
   } else if (res.code == 200 && res.data) {
     ElMessage({
       message: '导入失败，请查看原因重新导入！',
@@ -342,9 +342,8 @@ const handleSuccess = res => {
 };
 // 上传文件之前
 const beforeAvatarUpload = rawFile => {
-  console.log(rawFile, 'rawFile');
-
-  if (rawFile.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') {
+  // console.log(rawFile, 'rawFile');
+  if (rawFile.type !== 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' && rawFile.type !== 'application/vnd.ms-excel' ) {
     ElMessage.error('请上传EXCEL文件!');
     return false;
   }
@@ -514,6 +513,8 @@ const onLoad = async () => {
   }
 };
 onLoad();
+
+
 // 新增模板
 const Addtemplate = () => {
   $router.push({

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1220,7 +1220,6 @@ const screenHeight = ref(0); // 屏幕高度
 const eightyPercentHeight = ref(0); // 80% 高度
 const list = ref([]);
 const options = ref([]);
-
 const arbitrationTemp = ref(0); //完结当点击的那个菜单
 const CustomerData = ref([]); //客服指派表格查询
 const repulse = ref(false);
@@ -1898,10 +1897,19 @@ const OnLoad = () => {
 
 OnLoad();
 // 监听路由地址变化
-watch(() => route.path, (newPath, oldPath) => {
+watch(() => $route.path, (newPath, oldPath) => {
   if ($useStore.state.isRefresh.refreshObj.aftersalesWorkOrder) {
+      TabPermissions.value = $useStore.state.Customer.Customerobj
+      console.log(TabPermissions.value,'当前TabPermissions.value');
+      console.log( tabValue.value,'当前 tabValue.value');
+      tabValue.value=$useStore.state.Customer.Customerobj;//菜单编号
+      if([0,2,3,4].includes(TabPermissions.value)){
+        //0.全部菜单
+        //4. 理赔金未出
+        tabChenge(TabPermissions.value,null,true)
+        $useStore.commit('Customer_Menu',0);//设置回初始值
+      }
     // 重新请求数据
-    OnLoad();
     $useStore.commit('EDIT_REFRESHITEM', { title: 'aftersalesWorkOrder', status: false });
   }
 });

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -468,6 +468,8 @@
                       style="width: 100%"
                       filterable
                       clearable
+                      allow-create
+                      default-first-option
                     >
                       <el-option
                         v-for="items in item.ResponsibleoNameptions"
@@ -668,7 +670,6 @@
                 :headers="headers"
                 :on-success="ImgSuccess"
                 :before-upload="beforeAvatarUpload"
-                :on-preview="Imgpreview"
                 drag
                 multiple
                 list-type="picture-card"
@@ -1181,11 +1182,11 @@ const beforeAvatarUpload = rawFile => {
   }
   return true;
 };
-// 查看图片
-const Imgpreview = value => {
-  form.value.dialogVisible = true;
-  form.value.url = 'https://www.keaitupian.cn/cjpic/frombd/1/253/4039753288/2920140411.jpg';
-};
+// // 查看图片
+// const Imgpreview = value => {
+//   form.value.dialogVisible = true;
+//   form.value.url = 'https://www.keaitupian.cn/cjpic/frombd/1/253/4039753288/2920140411.jpg';
+// };
 // 图片上传成功回调函数
 const ImgSuccess = (response, uploadFile) => {
   if (response.success === true) {
@@ -1460,7 +1461,7 @@ const onSubmit = () => {
       console.log(form.value.fileList.length, '');
       if (form.value.fileList.length < 2) {
         ElMessage({
-          message: '请上传最低2张图片附件',
+          message: '请上传最低2张货损图片',
           type: 'warning',
         });
         return;
@@ -1470,7 +1471,7 @@ const onSubmit = () => {
     if (form.value.basis.workOrderType == '3') {
       if (!form.value.fileList.length) {
         ElMessage({
-          message: '请上传窜货图片附件',
+          message: '请上传窜货图片',
           type: 'warning',
         });
         return;
@@ -1552,6 +1553,7 @@ const onSubmit = () => {
         // 干线卸车环节不需要内部责任划分
         if (form.value.responsibilitiesList.length) {
           submitData.personResponsibleDTO = [];
+          let Responsibleperson=''
           form.value.responsibilitiesList.forEach(item => {
             console.log(item);
             let data = {
@@ -1559,31 +1561,31 @@ const onSubmit = () => {
               tripartite: item.tripartite, //三方责任人
               description: item.description, //说明
             };
+            // 责任人查询
+            Responsibleperson =  item.ResponsibleoNameptions.find(res => res.id == item.personResponsibleId)
             if (form.value.groundlineType == '1') {
-              data.personResponsibleName = item.personResponsibleId; //责任人名称
-              data.businessName = item.Processingoptions.find(
-                res => res.value == item.businessId
-              ).label; //责任方
+              data.personResponsibleName = item.personResponsibleId; //责任人名称 
+              data.businessName = item.Processingoptions.find( res => res.value == item.businessId).label; //责任方
               data.businessId = item.businessId; //责任方id
             } else {
-              data.personResponsibleId = item.personResponsibleId; //责任人id
-              data.personResponsibleName = item.ResponsibleoNameptions.find(
-                res => res.id == item.personResponsibleId
-              ).name; //责任人名称
-              data.businessName = item.Responsibleoptions.find(
-                res => res.value == item.businessId
-              ).label; //责任方
+              data.personResponsibleId = Responsibleperson?item.personResponsibleId:''; //责任人id
+              data.personResponsibleName = Responsibleperson? Responsibleperson.name:item.personResponsibleId; //责任人名称
+              data.businessName = item.Responsibleoptions.find( res => res.value == item.businessId).label; //责任方
               data.businessId = item.businessId; //责任方id
             }
+            // 如果是自定义责任人就删除ID
+            if(!data.personResponsibleId){
+              delete data.personResponsibleId
+            }
             submitData['personResponsibleDTO'].push(data);
           });
         }
       }
 
       // 图片处理
-      if (
+      if (   
         form.value.fileList.length &&
-        (form.value.groundlineType == '1' || form.value.groundlineType == '3')
+        (form.value.basis.workOrderType == '1' || form.value.basis.workOrderType == '3')
       ) {
         submitData.decreaseImageEntityList = [];
         form.value.fileList.forEach(item => {
@@ -1638,7 +1640,7 @@ const onSubmit = () => {
       } else {
         delete submitData.result; //删除处理结果字段
       }
-      console.log(submitData, '处理好的参数');
+
       form.value.Pageloading = true; //关闭页面加载
 
       //是否直接提交到处理结果
@@ -1647,6 +1649,7 @@ const onSubmit = () => {
       }
       //移除责任方表单(必须)
       delete submitData.processor;
+      console.log(submitData, '处理好的参数');
       $_submit(submitData)
         .then(res => {
           ElMessage({
@@ -1671,6 +1674,7 @@ const onSubmit = () => {
                   title: 'aftersalesWorkOrder',
                   status: true,
                 });
+                $useStore.commit('Customer_Menu',0);//要刷新的菜单
                 $useStore.commit('DEL_TAG_CURRENT'); //关闭当前页面
                 $router.push({
                   path: '/aftersales/aftersalesWorkOrder',

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -424,7 +424,7 @@
         <el-tabs
           type="border-card"
           class="demo-tabs el-endtabs"
-          v-if="CompensationParty.length && CompletedView.includes(Mydata.id)"
+          v-if='Completionpermissions'
         >
           <el-tab-pane>
             <template #label>
@@ -443,19 +443,7 @@
                   item.state == 0 ? '赔款方' : '受款方'
                 }}</span>
               </div>
-
               <div class="el_pkLi">
-                <!-- <div class="sk_input">
-                  <el-tooltip :content="item.name" placement="top">
-                    <el-input
-                      v-model="item.name"
-                      :placeholder="item.state == 0 ? '暂无赔款方' : '暂无受款方'"
-                      disabled
-                    />
-                  </el-tooltip>
-               </div> -->
-
-                <!-- 赔款方是那个仓库的 -->
                 <div class="sk_input">
                   <span>仓库</span>
                   <el-select v-model="item.warehouseId" disabled filterable placeholder="暂无仓库">
@@ -480,8 +468,6 @@
                     <el-input v-model="item.num" disabled />
                   </el-tooltip>
                 </div>
-
-                <!-- <div class="sk_input" v-if="item.state == 1"></div> -->
                 <!-- 责任人  -->
                 <div class="sk_input" v-if="item.state == 0">
                   <span>责任人</span>
@@ -516,13 +502,13 @@
           <!-- 仲裁原因 -->
           <!-- v-if="routerState == 'end'" -->
           <div class="arbitrate">
-            <el-form-item label="仲裁原因">
+            <el-form-item label="完结原因">
               <el-input
                 v-model="Indexform.arbitrate"
                 type="textarea"
                 :autosize="{ minRows: 5, maxRows: 4 }"
                 disabled
-                placeholder="暂无仲裁原因"
+                placeholder="暂无完结原因"
               />
             </el-form-item>
           </div>
@@ -1058,7 +1044,18 @@ const handle = () => {
     });
   });
 };
-
+// 是否可以查看完结信息
+const Completionpermissions =computed(()=>{
+  if(CompensationParty.value.length){
+    console.log(CompletedView.value,'CompletedView.value');
+    if(CompletedView.value.includes(Mydata.value.id) ||   UserPermissions.value!='仓库客服'){
+      console.log(CompletedView.value.includes(Mydata.id),'CompletedView.value.includes(Mydata.id)');
+      return true
+    }else{
+      return false
+    }
+   }
+})
 const onLoad = () => {
   pageState.value = true; //开启页面加载
   if (localStorage.getItem('my_data')) {
@@ -1226,6 +1223,7 @@ const onLoad = () => {
       // 获取赔款方和受款方信息
       if (CompensationParty.value.length) {
         CompletedView.value = CompensationParty.value.map(item => {
+          console.log(CompensationParty.value,'CompensationParty.value');
           if (item.warehouseId) {
             return item.warehouseId;
           }
@@ -1235,8 +1233,9 @@ const onLoad = () => {
       }
     });
   });
-  // 中擦原因回显
 
+
+  // 仲裁原因回显
   console.log(Mydata.value, '记录本地登录');
   getDictionaryBiz('result_handling').then(res => {
     console.log(res, '发现环节');
@@ -1297,6 +1296,7 @@ const addingRecord = () => {
       id: $route.query.id,
       name: $route.query.workOrderNumber + '-添加异常记录',
       businessId: $route.query.workOrderNumber,
+      RouteIndexs: $route.query.RouteIndexs,
       RouterState: 'record',
       index: '1',
     },
@@ -1312,7 +1312,7 @@ const EndJump = () => {
       id: $route.query.id,
       name: $route.query.workOrderNumber + '-完结填写',
       RouterState: 'end',
-      index: '2',
+      RouteIndexs:$route.query.RouteIndexs,
       workOrderStatus: $route.query.workOrderStatus, //当前单子状态
     },
   });
@@ -2316,16 +2316,15 @@ const ResultDetermination = () => {
     height: 100%;
     display: block;
     font-size: 14px;
-    font-weight: 500;
+    font-weight: bold;
   }
 
   .sk_input {
     margin: 0 5px;
     margin-left: 4px;
-    width: 20%;
+    width: 22%;
     display: flex;
     align-items: center;
-
     span {
       width: 100px;
       margin-right: 4px;
@@ -2333,6 +2332,7 @@ const ResultDetermination = () => {
       justify-content: flex-end;
       font-size: 14px;
       font-weight: 400;
+      margin-right: 10px;
     }
   }
 

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -338,7 +338,7 @@
                       :reserve-keyword="false"
                       placeholder="请选择处理结果"
                       @change="changeProcessingResults"
-                      :disabled="$route.query.index == '0' || $route.query.index == '2'"
+                      :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'"
                     >
                       <el-option
                         v-for="item in ProcessingResults"
@@ -416,7 +416,7 @@
                           clearable
                           :autosize="{ minRows: 3, maxRows: 4 }"
                           type="textarea"
-                          :disabled="$route.query.index == '0' || $route.query.index == '2'"
+                          :disabled="$route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2'"
                         />
                       </el-form-item>
                       <div class="el_tool">
@@ -511,14 +511,14 @@
               </el-tab-pane>
             </el-tabs>
 
-            <!-- 仲裁原因 -->
+            <!-- 完结说明 -->
             <div class="arbitrate" v-if="routerState == 'end'">
               <el-tabs type="border-card" class="demo-tabs">
                 <el-tab-pane>
                   <template #label>
                     <span class="custom-tabs-label">
                       <el-icon><calendar /></el-icon>
-                      <span>仲裁原因</span>
+                      <span>完结说明</span>
                     </span>
                   </template>
 
@@ -526,7 +526,7 @@
                     v-model="endFrom.arbitrate"
                     type="textarea"
                     :autosize="{ minRows: 5, maxRows: 4 }"
-                    placeholder="请输入仲裁原因"
+                    placeholder="请输入完结说明"
                   />
                 </el-tab-pane>
               </el-tabs>
@@ -573,7 +573,7 @@
                 :action="doubledCount"
                 :headers="headers"
                 :on-success="ViodSuccess"
-                :disabled="$route.query.index == '0'"
+                :disabled="$route.query.RouteIndexs == '0'"
               >
                 <el-icon class="el-icon--upload"><upload-filled /></el-icon>
                 <div class="el-upload__text">
@@ -593,21 +593,21 @@
 
           <div class="el_sub">
             <el-button
-              v-if="$route.query.index != '0' && $route.query.RouterState == 'end'"
+              v-if="$route.query.RouteIndexs != '0' &&  $route.query.RouterState == 'end'"
               type="primary"
               class="button"
               @click="submitCompletion"
               >完结提交</el-button
             >
             <el-button
-              v-if="$route.query.index != '0' && $route.query.RouterState == 'record'"
+              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'record'"
               type="primary"
               class="button"
               @click="submitresults(1)"
               >处理结果提交</el-button
             >
             <el-button
-              v-if="$route.query.index != '0' && $route.query.RouterState == 'record'"
+              v-if="$route.query.RouteIndexs != '0' && $route.query.RouterState == 'record'"
               type="primary"
               class="button"
               @click="submitresults(2)"
@@ -615,7 +615,7 @@
             >
             <!-- <el-button
               @click="DetermineStorage"
-              v-if="$route.query.index != '0'"
+              v-if="$route.query.RouteIndexs != '0'"
               type="primary"
               class="button"
               >确定</el-button
@@ -626,10 +626,10 @@
               type="primary"
               class="button"
               @click="CustomerServiceCompleted"
-              >客服仲裁完结</el-button
+              >客服完结完结</el-button
             >
             <el-button
-              v-if="$route.query.index == '0' && $route.query.workOrderStatus != '21'"
+              v-if="$route.query.RouteIndexs == '0' && $route.query.workOrderStatus != '21'"
               type="primary"
               class="button"
               @click="ElProcessingResults"
@@ -947,9 +947,8 @@ import { useRoute, useRouter } from 'vue-router';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { computeNumber, isNumber, AddressClosed, deepClone } from '@/utils/util';
 import { useStore } from 'vuex';
-import error from '@/error';
 // 获取vuex仓库
-const $store = useStore();
+const $useStore = useStore();
 const identifying = ref(1); //订单类型
 const ZFdialog = ref(false); //支付方式弹出
 const $route = useRoute();
@@ -1360,7 +1359,7 @@ const onLoad = async () => {
               });
             });
           }
-          endFrom.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
+          endFrom.value.arbitrate = res.data.data.reasonArbitration; //完结说明
           Pageloading.value = false;
         });
       }
@@ -1905,7 +1904,7 @@ const personResponsiblechange = (val, index) => {
 };
 // 支付方式选择
 const PaymentSelection = val => {
-  if ($route.query.index == '0' || $route.query.index == '2') {
+  if ($route.query.RouteIndexs == '0' || $route.query.RouteIndexs == '2') {
     return;
   }
   console.log(val, '支付');
@@ -2065,6 +2064,9 @@ const submitresults = async value => {
               message: res.data.msg,
               type: 'success',
             });
+            // 传递要刷新的菜单
+            $useStore.commit('EDIT_REFRESHITEM', {title: 'aftersalesWorkOrder',status: true,});//要刷新的页面
+            $useStore.commit('Customer_Menu',Number($route.query.RouteIndexs));//要刷新的菜单
             $router.push('/aftersales/aftersalesWorkOrder');
             AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
           }
@@ -2083,8 +2085,15 @@ const submitresults = async value => {
 
 // 完结信息提交()
 const submitCompletion = () => {
-  
-
+  console.log(  CompensationParty.value);
+ let _warehouseId= CompensationParty.value.find(res=>!res.warehouseId)
+ if(_warehouseId){
+  ElMessage({
+      message: `有赔款方或受款方仓库未选择`,
+      type: 'warning',
+    });
+    return
+ }
   ElMessageBox.confirm('是否提交完结信息?', '完结', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -2100,7 +2109,7 @@ const submitCompletion = () => {
           id: $route.query.id,
           completionRecipientEntities: [], //受款方
           completionRecordEntities: [], //赔款方
-          reasonArbitration: endFrom.value.arbitrate, //仲裁原因
+          reasonArbitration: endFrom.value.arbitrate, //完结说明
         },
       ];
       console.log(endFrom.value.duty, '责任方');
@@ -2113,7 +2122,7 @@ const submitCompletion = () => {
           data[0]['completionRecordEntities'].push({
             reason: item.reason, //原因
             money: item.num, //金额
-            reasonArbitration: endFrom.value.arbitrate, //仲裁说明
+            reasonArbitration: endFrom.value.arbitrate, //完结说明
             compensationPersonnel: item.compensationPersonnel, //责任人（手动填写）
             warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
             explains: item.reason, //赔款说明
@@ -2151,6 +2160,9 @@ const submitCompletion = () => {
               message: res.data.msg,
               type: 'success',
             });
+
+            $useStore.commit('EDIT_REFRESHITEM', {title: 'aftersalesWorkOrder',status: true,});//要刷新的页面
+            $useStore.commit('Customer_Menu',Number($route.query.RouteIndexs));//要刷新的菜单
             $router.push('/aftersales/aftersalesWorkOrder');
             AddressClosed('/aftersales/aftersalesWorkOrderend'); //删除当前页面
           }
@@ -2193,7 +2205,7 @@ const submitCompletions = async val => {
             id: $route.query.id,
             completionRecipientEntities: [], //受款方
             completionRecordEntities: [], //赔款方
-            reasonArbitration: endFrom.value.arbitrate, //仲裁原因
+            reasonArbitration: endFrom.value.arbitrate, //完结说明
           },
         ];
         console.log(endFrom.value.duty, '责任方');
@@ -2207,7 +2219,7 @@ const submitCompletions = async val => {
               // indemnitor: item.name, //赔款方
               reason: item.reason, //原因
               money: Number(item.num), //金额
-              reasonArbitration: endFrom.value.arbitrate, //仲裁说明
+              reasonArbitration: endFrom.value.arbitrate, //完结说明
               compensationPersonnel: item.compensationPersonnel, //责任人（手动填写）
               warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
               explains: item.reason, //赔款说明
@@ -2621,15 +2633,15 @@ const ElProcessingResults = () => {
       index: '1',
     },
   });
-  $store.commit('DEL_TAG_CURRENT');
+  $useStore.commit('DEL_TAG_CURRENT');
 };
-// 客服仲裁完结
+// 客服完结完结
 const CustomerServiceCompleted = () => {
   $router.push({
     path: '/aftersales/aftersalesWorkOrdermodify',
     query: {
       id: $route.query.id,
-      name: $route.query.businessId + '-客服仲裁完结',
+      name: $route.query.businessId + '-客服完结完结',
       businessId: $route.query.businessId,
       warehouseId: $route.query.warehouseId ? $route.query.warehouseId : '',
       workOrderNumber: $route.query.workOrderNumber,
@@ -2637,7 +2649,7 @@ const CustomerServiceCompleted = () => {
       index: '1',
     },
   });
-  $store.commit('DEL_TAG_CURRENT');
+  $useStore.commit('DEL_TAG_CURRENT');
 };
 </script>
 

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -615,14 +615,14 @@
       </el-tab-pane>
     </el-tabs>
 
-    <!-- 仲裁原因 -->
+    <!-- 完结原因 -->
     <div class="arbitrate" v-if="CompensationParty.length">
       <el-tabs type="border-card" class="demo-tabs">
         <el-tab-pane>
           <template #label>
             <span class="custom-tabs-label">
               <el-icon><calendar /></el-icon>
-              <span>仲裁原因</span>
+              <span>完结原因</span>
             </span>
           </template>
 
@@ -630,7 +630,7 @@
             v-model="Indexform.arbitrate"
             type="textarea"
             :autosize="{ minRows: 5, maxRows: 4 }"
-            placeholder="请输入仲裁原因"
+            placeholder="请输入完结原因"
             :disabled="ProcessingresultsState"
           />
         </el-tab-pane>
@@ -681,7 +681,7 @@
         @click="Arbitrationcompleted"
         v-if="$route.query.CustomerServiceCompleted && UserPermissions != '仓库客服'"
       >
-        仲裁完结提交
+        完结完结提交
       </el-button>
 
       <!-- 申诉编辑提交 -->
@@ -698,7 +698,7 @@
         处理结果修改提交
       </el-button>
 
-      <!--客服仲裁完结 -->
+      <!--客服完结完结 -->
     </div>
   </el-card>
 
@@ -1087,13 +1087,13 @@ const onLoad = () => {
   } else {
     ProcessingresultsState.value = true;
   }
-  // 客服仲裁完结提交（完结信息）
+  // 客服完结完结提交（完结信息）
   if ($route.query.CustomerServiceCompleted && UserPermissions.value != '仓库客服') {
     CompleteDisabling.value = false;
   } else {
     CompleteDisabling.value = true;
   }
-  // 仲裁成立编辑完结信息
+  // 完结成立编辑完结信息
   if ($route.query.AppealEstablished) {
     CompleteDisabling.value = false; //可以编辑完结信息
   }
@@ -1355,7 +1355,7 @@ const onLoad = () => {
       }
     }
 
-    Indexform.value.arbitrate = res.data.data.reasonArbitration; //仲裁原因
+    Indexform.value.arbitrate = res.data.data.reasonArbitration; //完结原因
     // 异常类型下标
     SelectType.value = IndexException.value.find(
       item => item.value == Indexform.value.workOrderType
@@ -2017,7 +2017,7 @@ const AppealEditor = () => {
     let data = {
       completionRecipientEntities: [], //处理结果受款方
       completionRecordEntities: [], //处理结果赔款方
-      reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+      reasonArbitration: Indexform.value.arbitrate, //完结原因
       id: $route.query.id,
       appealId: $route.query.appealID, //申诉ID
       typesOf: '1', //申诉完结编辑新增标识
@@ -2039,7 +2039,7 @@ const AppealEditor = () => {
           // indemnitor: item.name, // 赔款方
           reason: item.reason, // 原因
           money: Number(item.num), // 金额
-          reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+          reasonArbitration: Indexform.value.arbitrate, //完结原因
           workOrderId: $route.query.id, // 异常工单
           warehouseId: item.warehouseId, //仓库ID
           compensationPersonnel: item.personResponsibleList, //责任人
@@ -2222,13 +2222,13 @@ const UnpaidClaimsEdited = () => {
     return;
   }
 };
-// 客服仲裁完结
+// 客服完结完结
 const Arbitrationcompleted = () => {
   let data = {
     id: $route.query.id,
     completionRecipientEntities: [], //处理结果受款方
     completionRecordEntities: [], //处理结果赔款方
-    reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+    reasonArbitration: Indexform.value.arbitrate, //完结原因
     aftersalesProcessingResultsDTO: {
       workOrderId: $route.query.id, //异常工单ID
     },
@@ -2325,7 +2325,7 @@ const Arbitrationcompleted = () => {
 //     let data = {
 //       completionRecipientEntities: [], //处理结果受款方
 //       completionRecordEntities: [], //处理结果赔款方
-//       reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+//       reasonArbitration: Indexform.value.arbitrate, //完结原因
 //       id: $route.query.id,
 //       appealId: $route.query.appealID, //申诉ID
 //       typesOf: '1', //申诉完结编辑新增标识
@@ -2347,7 +2347,7 @@ const Arbitrationcompleted = () => {
 //           // indemnitor: item.name, // 赔款方
 //           reason: item.reason, // 原因
 //           money: Number(item.num), // 金额
-//           reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+//           reasonArbitration: Indexform.value.arbitrate, //完结原因
 //           workOrderId: $route.query.id, // 异常工单
 //           warehouseId: item.warehouseId, //仓库ID
 //           compensationPersonnel: item.personResponsibleList, //责任人
@@ -2511,7 +2511,7 @@ const Arbitrationcompleted = () => {
 //   //     completionRecipientEntities: [], //处理结果受款方
 //   //     completionRecordEntities: [], //处理结果赔款方
 //   //     typesOf: '1', //申诉完结编辑新增标识
-//   //     reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+//   //     reasonArbitration: Indexform.value.arbitrate, //完结原因
 //   //     appealId: $route.query.appealID,
 //   //     id: $route.query.id,
 //   //     workOrderId: $route.query.id, //异常工单ID（这里是workOrderId）
@@ -2524,7 +2524,7 @@ const Arbitrationcompleted = () => {
 //   //         indemnitor: item.name, // 赔款方
 //   //         reason: item.reason, // 原因
 //   //         money: Number(item.num), // 金额
-//   //         reasonArbitration: Indexform.value.arbitrate, //仲裁原因
+//   //         reasonArbitration: Indexform.value.arbitrate, //完结原因
 //   //         workOrderId: $route.query.id, // 异常工单
 //   //         warehouseId: item.warehouseId, //仓库ID
 //   //         compensationPersonnel: item.personResponsibleList, //责任人

src/views/aftersales/aftersalesWorkOrdermodifyTemp.vue

@@ -1656,7 +1656,7 @@ return
       // 图片处理
       if (
         form.value.fileList.length &&
-        (form.value.groundlineType == '1' || form.value.groundlineType == '3')
+        (form.value.basis.workOrderType == '1' || form.value.basis.workOrderType == '3')
       ) {
         submitData.decreaseImageEntityList = [];
         form.value.fileList.forEach(item => {
@@ -1664,7 +1664,7 @@ return
             submitData['decreaseImageEntityList'].push({
               imageName: item.response.data.originalName, //图片名称
               imagePath: item.response.data.link, //图片地址
-              imageType: form.value.groundlineType == 1 ? 10 : 20, //图片类型
+              imageType: form.value.basis.workOrderType == 1 ? 10 : 20, //图片类型
             });
           }
         });

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -413,10 +413,10 @@ export default {
         },
         {
           prop: 'trainNumber',
-          label: '车次',
+          label: '车次号',
           type: 2,
           values: '',
-          width: '130',
+          width: '180',
           checkarr: [],
           fixed: true,
           sortable: true,

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -409,10 +409,10 @@ export default {
         },
         {
           prop: 'trainNumber',
-          label: '车次',
+          label: '车次号',
           type: 2,
           values: '',
-          width: '130',
+          width: '180',
           checkarr: [],
           fixed: true,
           sortable: true,

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -324,10 +324,10 @@ export default {
         },
         {
           prop: 'trainNumber',
-          label: '车次',
+          label: '车次号',
           type: 2,
           values: '',
-          width: '140',
+          width: '180',
           checkarr: [],
           fixed: true,
           sortable: true,
@@ -577,10 +577,10 @@ export default {
         },
         {
           prop: 'trainNumber',
-          label: '车次',
+          label: '车次号',
           type: 2,
           values: '',
-          width: '140',
+          width: '180',
           checkarr: [],
           fixed: true,
           sortable: true,

src/views/financialsector/CustomerBaseprice.vue

@@ -379,11 +379,9 @@ const dialogVisible = () => {};
 
 onActivated(() => {
   console.log('进入缓存');
-
   if ($useStore.state.isRefresh.refreshObj.CustomerBaseprice) {
     // 重新请求数据
     searchReset();
-
     $useStore.commit('EDIT_REFRESHITEM', { title: 'CustomerBaseprice', status: false });
   }
 });

src/views/financialsector/Financialse/FinancialWarehousing.vue

@@ -204,7 +204,7 @@
         </div>
 
         <!-- 附加费品类配置 -->
-        <div class="el_Storage" v-if="form.warehouseIsCategorySubjoin" style="width: 24%">
+        <div class="el_Storage" v-if="form.warehouseIsAddFee" style="width: 24%">
           <div class="Storage-cont">
             <span class="el_table_span">附加费品类配置</span>
             <!-- 表格  -->
@@ -579,7 +579,23 @@ const iswarehouseIsAddFee = () => {
   form.value.warehouseIsOperateFee = 0; //是否有操作/装卸费
   form.value.warehouseIsSortFee = 0; //是否有分拣费用
   form.value.warehouseIsCategorySubjoin = 0; //附加费用是否统一计费
+    // 附加品类
+    form.value.AdditionalcategoriesData=[
+    {
+      index: 1,
+      warehousePieceCategory: '',
+      options: [],
+      plus: true,
+      reduce: false,
+      StateName: 'additional', //附加品类
+      loading: false,
+    },
+  ]
 };
+
+
+
+
 async function updateDictionary(targetArray, dictionaryType) {
   await getDictionaryBiz(dictionaryType)
     .then(res => {