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

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -927,7 +927,7 @@ const ConfirmForm = () => {
   //   waybillNumber: PackageInfo.value.map(item => item.waybillNumber).join(','), //运单号
   //   orderCode: PackageInfo.value.map(item => item.orderCode).join(','), //订单自编码
   // });
-  DataSubmit.orderCode = PackageInfo.value.map(item => item.orderCode).join(','); //订单自编码
+  DataSubmit.orderCode = [...new Set(PackageInfo.value.map(item => item.orderCode))].join(',');
   // 总件数
   Indexform.value.number = PackageInfo.value.length;
   console.log(DataSubmit['packageEntityList'], '包件信息');

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -549,11 +549,14 @@ const HistoricalPackageList = ref([]); //历史包件数组
 const HistorIndex = ref(0); //历史包件索引
 const TotalClaimAmount = ref(0); //总金额
 const dialogReturn = ref(false); //打回弹窗
+const ProcessingRecords =ref([]);//处理放记录用于匹配按钮
 const repulse = ref(false); //加载效果
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
 const RouteIndexs = ref(''); //进入前的页面索引
 const UserPermissions = ref('');//当前状态
+const warehouseInfo=ref('');//仓库信息
+const warehouseState=ref(false);//仓库权限
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' },
@@ -621,7 +624,7 @@ function updateDictionary(targetArray, dictionaryType) {
     console.log(UserPermissions.value, '当前角色权限');
   });
 
-
+warehouseInfo.value = localStorage.getItem('WarehouseName');
 
 
 // 图片上传必须携带TOKEN
@@ -680,10 +683,10 @@ const ButtonPermissions = computed(() => {
       return {
         reply: UserPermissions.value == '仓库客服', //回复按钮
         ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
-        end: UserPermissions.value == '职能客服', //完结按钮
+        end: UserPermissions.value != '仓库客服', //完结按钮
-        repulse: UserPermissions.value == '职能客服', //打回按钮
+        repulse: UserPermissions.value != '仓库客服', //打回按钮
         ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
-        edit: false, //编辑
+        edit:UserPermissions.value == '仓库客服', //编辑
       };
     case RouteIndexs.value == 4: //理赔金额未出
       return {
@@ -696,7 +699,7 @@ const ButtonPermissions = computed(() => {
       };
     case RouteIndexs.value == 5: //仲裁中
       return {
-        reply: false, //回复按钮
+        reply: UserPermissions.value == '职能客服', //回复按钮
         ProcessingResults: false, //处理结果按钮
         end: false, //完结按钮
         repulse: false, //打回按钮
@@ -832,6 +835,7 @@ const onLoad = () => {
   $_getInfo({ id: $route.query.id }).then(res => {
     console.log(res, '回显返回值参数');
     Indexform.value = res.data.data;
+
     Indexform.value['result'] = [];
     Indexform.value['processor'] = [];
     //图片处理回显
@@ -869,10 +873,12 @@ const onLoad = () => {
     res.data.data.processorVOList.forEach(item => {
       if (item.typesOf == 2) {
         // 处理方
+        ProcessingRecords.value.push(item.businessId)
         Indexform.value.processor.push(item.businessId);
       }
     });
-
+    // let a=['张三','李四']
+    // let b=['张三']
     companyProportion.value = 100 - sum;
 
     // updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
@@ -905,6 +911,7 @@ const onLoad = () => {
     // 处理结果说明回显
     Indexform.value.resultDescription = res.data.data.processingResultsVO.resultDescription;
   });
+
 };
 onLoad(); //初始化程序
 // 异常类型事件
@@ -1481,9 +1488,10 @@ const EndJump = () => {
   }
 }
 .foot_btn {
+width: 100%;
   position: fixed;
   bottom: 0;
-  left: 42%;
+  left: 50%;
   height: 40px;
   display: flex;
   align-items: center;

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -74,7 +74,7 @@
             />
           </el-form-item>
 
-          <el-form-item label="发货时间" class="el_lab">
+          <el-form-item label="发货时间" class="el_lab" >
             <el-date-picker
               v-model="endFrom.warehousingTime"
               type="datetime"
@@ -88,7 +88,7 @@
             <el-input v-model="endFrom.processNumber" disabled placeholder="请输入钉钉流程号" />
           </el-form-item> -->
 
-          <el-form-item label="处理方" class="el_lab">
+          <el-form-item label="处理方" class="el_lab" style="flex: 0 0 32.5%">
             <el-select
               v-model="endFrom.processor"
               multiple
@@ -107,60 +107,16 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="" class="el_lab"> </el-form-item>
-          <div class="el_dcl">
-            <!-- <div class="selector">
-              <div class="el-form-item">
-                <span class="el-form-item__label">处理方</span>
-                <el-select
-                  v-model="endFrom.processor"
-                  multiple
-                  filterable
-                  default-first-option
-                  :reserve-keyword="false"
-                  placeholder="请选择处理方"
-                  @change="css"
-                >
-                  <el-option
-                    v-for="item in warehouseData"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  />
-                </el-select>
-              </div>
-            </div> -->
 
-            <!-- <div class="el_Transport">
+          <el-form-item label="异常问题描述">
-            <el-form-item label="运损发现节点">
+            <el-input
-              <el-radio-group v-model="endFrom.transportloss" @change="TransportChange">
+              v-model="endFrom.problemDescription"
-                <el-radio v-for="item in TransportlossList" :label="item.label">{{
+              type="textarea"
-                  item.txt
+              placeholder="请输入异常问题描述"
-                }}</el-radio>
+              disabled
-              </el-radio-group>
+            />
-            </el-form-item>
+            <!-- :disabled="$route.query.index == '0'" -->
-          </div> -->
+          </el-form-item>
-          </div>
-          <!-- <div class="selector">
-            <div class="el-form-item selector">
-              <span class="el-form-item__label">责任方</span>
-              <el-select
-                v-model="endFrom.duty"
-                multiple
-                filterable
-                default-first-option
-                :reserve-keyword="false"
-                placeholder="请选择责任方"
-              >
-                <el-option
-                  v-for="item in warehouseData"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </div>
-          </div> -->
 
           <el-tabs type="border-card" class="PackageInformation">
             <el-tab-pane label="包件信息">
@@ -483,19 +439,6 @@
               />
             </el-form-item>
 
-            <!-- 备注信息 -->
-            <div class="notes">
-              <el-form-item label="异常问题描述">
-                <el-input
-                  v-model="endFrom.problemDescription"
-                  type="textarea"
-                  :autosize="{ minRows: 3, maxRows: 4 }"
-                  placeholder="请输入异常问题描述"
-                  :disabled="$route.query.index == '0'"
-                />
-              </el-form-item>
-            </div>
-
             <!-- 图片  -->
             <div class="Transport_damage_photos">
               <span class="title">图片</span>
@@ -855,6 +798,7 @@ const accountingID = ref(); //财务处理当id前值
 const dialogImgList = ref(false); //图片预览弹窗
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
+
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '' },
@@ -1636,7 +1580,7 @@ const submit = () => {
     console.log(info, 'info');
     let data = [
       {
-        id:$route.query.id,
+        id: $route.query.id,
         completionRecipientEntities: [], //收款方
         completionRecordEntities: [], //赔款方
         reasonArbitration: endFrom.value.arbitrate, //仲裁原因
@@ -1680,7 +1624,7 @@ const submit = () => {
     });
 
     // 赔款方
-    
+
     console.log(data, '处理好的值');
     $_addCompletionEnd(data).then(res => {
       console.log(res, '完结成功返回值');

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -381,9 +381,18 @@
                           </template>
                         </el-table-column>
                       </template>
+            
                     </template>
                   </el-table>
                   <div class="el-Cart-button-btn">
+                    <!-- <div>
+                      已选择:3条 
+                      <span>合计:</span>
+                      <div>
+                      <span>订单总件数:22</span>
+                      <span>在库件数:33</span>
+                    </div>
+                    </div> -->
                     <el-button type="primary" @click="SubmitCommercial"
                       ><el-icon><Select /></el-icon>提交(商配订单)</el-button
                     >
@@ -843,6 +852,7 @@ const isZeroTable = ref([]); //零担表格
 const comprehensive = ref(false); //司机,零担弹窗
 const QuantityEntryStatus = ref(false); //零担数量录入状态
 const TCzj = ref(); //弹窗组件实例
+const statisticsList=ref([]);//需要统计的字段
 const inputValue = ref('number'); //零担输入的值
 // 司机选择信息
 // 车辆选项
@@ -1290,6 +1300,7 @@ const menuData = ref([
     fixed: false,
     sortable: true,
     head: true,
+    statistics:true,//开启统计
   },
   {
     prop: 'handQuantity',
@@ -1301,6 +1312,7 @@ const menuData = ref([
     fixed: false,
     sortable: true,
     head: true,
+    statistics:true,//开启统计
   },
   {
     prop: 'completeSetName',
@@ -1563,6 +1575,10 @@ const wrap = ref([
 function onLoad() {
   loading.value = true; //开启加载效果
 }
+
+statisticsList.value=  menuData.value.filter(item=>item.statistics);//筛选出要统计的
+console.log(statisticsList.value,'需要统计的字段');
+
 const TabHeig = () => {
   TabHeight.value = TabHeight.value.offsetHeight; //表格高度
   console.log(TabHeight.value.offsetHeight, 'TabHeight.value.offsetHeight');
@@ -2875,7 +2891,7 @@ const SubmitCommercial = () => {
   }
   .el-Cart-button-btn {
     display: flex;
-    justify-content: flex-end;
+    justify-content: space-between;
     margin-top: 18px;
   }
 }