修复商配订单包件误操作

1 year ago · 9889442421
8 changed files with 1363 additions and 1238 deletions
--- a/src/components/tablecmt/tablecmt.vue
+++ b/src/components/tablecmt/tablecmt.vue
@ -385,14 +385,20 @@ function handleCheckSelect(select: []) {
  if (select.length !== 0) {
    select.map(item => {
      if (props.isselectfun) {
+        console.log('执行力是否禁用勾选');
+        
        if (props.isselectfun(item)) {
          selecttable.value.toggleRowSelection(item, true);
+        }else{
+          selecttable.value.toggleRowSelection(item, true);
        }
      } else {
+        console.log('没有执行否禁用勾选');
        selecttable.value.toggleRowSelection(item, true);
      }
    });
  } else {
+    console.log('都不满足');
    selecttable.value.clearSelection();
  }
 }
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@ -765,10 +765,22 @@ export default [
      {
        path: '/distribution/turndelivery/deliveryDiscuss',
        name: '商配计划',
-        component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
+        component: () => import('@/views/distribution/turndelivery/deliveryDiscusscopy.vuevuey.vue'),
      },
    ],
  },
+  // {
+  //   path: '/distribution/turndelivery/deliveryDiscusscopy',
+  //   component: Layout,
+  //   redirect: '/distribution/turndelivery/deliveryDiscusscopy',
+  //   children: [
+  //     {
+  //       path: '/distribution/turndelivery/deliveryDiscusscopy',
+  //       name: '商配计划测试',
+  //       component: () => import('@/views/distribution/turndelivery/deliveryDiscuss.vue'),
+  //     },
+  //   ],
+  // },
  {
    path: '/warehouse/warehouseRetentionRecord/warehouseRetentionDetails',
    component: Layout,
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@ -136,6 +136,14 @@
                    @click="Batchcompletion"
                    >批量完结</el-button
                  >
+                        <!-- 仲裁中确定结束仲裁按钮 -->
+                        <el-button
+                            type="primary"
+                            v-if="ButtonPermissions.ArbitrationDetermination"
+                            @click="AllEndArbitration"
+                          >批量仲裁完成</el-button
+                        >
+
                  <!-- <el-button
                    ButtonPermissions.batchFinish
                    type="primary"
@ -1108,6 +1116,7 @@ const ButtonPermissions = computed(() => {
        batchFinish: UserPermissions.value != '仓库客服', //批量完结
        appeal: false, //申诉
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 1: //处理中
      return {
@ -1119,6 +1128,7 @@ const ButtonPermissions = computed(() => {
        Batchdetermination: UserPermissions.value != '仓库客服', //批量确定
        appeal: false, //申诉
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 2: //处理完毕
      return {
@ -1130,6 +1140,7 @@ const ButtonPermissions = computed(() => {
        appeal: UserPermissions.value == '仓库客服' && AppealStatusT.value, //申诉
        Batchdetermination: UserPermissions.value == '仓库客服', //批量确定
        ManagerConfirmed:UserPermissions.value == '总部客服经理',//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 3: //待处理
      return {
@ -1141,6 +1152,7 @@ const ButtonPermissions = computed(() => {
        appeal: false, //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 4: //理赔金额未出
      return {
@ -1152,6 +1164,7 @@ const ButtonPermissions = computed(() => {
        appeal: false, //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 5: //仲裁中
      return {
@ -1163,6 +1176,7 @@ const ButtonPermissions = computed(() => {
        appeal: false, //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:true,//批量仲裁确定
      };
    case 6: //完结
      return {
@ -1174,6 +1188,7 @@ const ButtonPermissions = computed(() => {
        appeal: UserPermissions.value == '仓库客服', //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 7: //超时未处理
      return {
@ -1185,6 +1200,7 @@ const ButtonPermissions = computed(() => {
        appeal: false, //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    case 8: //待回复
      return {
@ -1196,6 +1212,7 @@ const ButtonPermissions = computed(() => {
        appeal: false, //申诉
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
    // 其他任何情况下的默认情况
    default:
@ -1208,6 +1225,7 @@ const ButtonPermissions = computed(() => {
        appeal: false,
        Batchdetermination: false, //批量确定
        ManagerConfirmed:false,//处理完毕下面的客服经理批量确定
+        ArbitrationDetermination:false,//批量仲裁确定
      };
  }
 });
@ -1265,6 +1283,7 @@ const Statusprocessing = val => {
    // }
    // 对状态进行处理
    if (item.workOrderType == 1) {
+      console.log(columnList,'columnList');
      item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损
    } else if (item.workOrderType == 2) {
      item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货
@ -3058,14 +3077,6 @@ const DetermineStorage = val => {

 // 仲裁里面确定按钮
 const EndArbitration=(val)=>{
-  // if (!details.selectionList.length) {
-  //     ElMessage({
-  //       message: '请勾选要处理的数据数据',
-  //       type: 'warning',
-  //     });
-  //     return;
-  //   }
-
  console.log(val,'当前参数');
 let data={
  assignList:[val.row.id]
@ -3078,16 +3089,45 @@ $_updateArbitrateStatu(data).then(res=>{
    message: res.data.msg,
    type: 'success',
  })
-  DataRendering(TabPermissions.value);
+  DataRendering(TabPermissions.value,details.query);
  }
 }).catch(res=>{
  console.log(res,'报错原因');
 }).finally(()=>{
-
  details.loadingObj.list = false; //开启加载效果
 })
 }
-
+// 批量仲裁确定
+const AllEndArbitration=()=>{
+  // 校验是否勾选了数据
+  if (!details.selectionList.length) {
+      ElMessage({
+        message: '请勾选要处理的数据数据',
+        type: 'warning',
+      });
+      return;
+    }
+let data={
+  assignList:[]
+}
+data['assignList'] =  details.selectionList.map(res=>res.id);//获取批量仲裁的ID
+console.log('批量仲裁确定处理好的值');
+$_updateArbitrateStatu(data).then(res=>{
+  console.log(res,'处理成功');
+  if(res.data.code == 200){
+    ElMessage({
+    message: res.data.msg,
+    type: 'success',
+  })
+  DataRendering(TabPermissions.value,details.query);
+  }
+}).catch(res=>{
+  console.log(res,'报错原因');
+}).finally(()=>{
+  details.selectionList=[];//清空勾选数据
+  details.loadingObj.list = false; //开启加载效果
+})
+}
 // 处理完毕里面确定（仓库客服用的）

 const ResultConfirmation = (val) => {
--- a/src/views/aftersales/aftersalesWorkOrderAdd.vue
+++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue
@ -1202,7 +1202,7 @@ const ConfirmForm = () => {
      // 调查经过
      DataSubmit.surveyRecordDTO = {
        content: Indexform.value.investigationPocess,
-        workOrderId: Indexform.value.workOrderNumber ? Indexform.value.workOrderNumber : null,
+        // workOrderId: Indexform.value.workOrderNumber ? Indexform.value.workOrderNumber : null,
      };
      console.log(DataSubmit.surveyRecordDTO, '调查经过');
      // 环节责任方填写校验
@ -1541,7 +1541,6 @@ const ChangePackageInfo = (val, index) => {
    $_getAbnormalPackage(data).then(res => {
      console.log(res, '包件信息');
      console.log(res.data.data, '包件信息');
-
      if (res.data.data.length) {
        console.log(NumberPackages.value, 'NumberPackages.value ');
        console.log(PackageInfo.value, 'PackageInfo.value');
@ -1574,9 +1573,7 @@ const ChangePackageInfo = (val, index) => {
        PackageInfo.value[index].orderId = packageData.orderId; //运单号
        PackageInfo.value[index].brandName = packageData.brandName; //品牌
        PackageInfo.value[index].mallName = packageData.mallName; //运单商场
-
        PackageInfo.value[index].state = false; //状态
-
        const results = res.data.data.filter(item => {
          return item.workOrderId && item.workOrderNumber;
        });
@ -1591,9 +1588,7 @@ const ChangePackageInfo = (val, index) => {
        Indexform.value.first = packageData.firsts; //一级品
        Indexform.value.secondary = packageData.second; //二级品
        Indexform.value.waybillMall = packageData.mallName; //客户名称（运单商场）
-        Indexform.value.typeServiceName = packageData.typeServiceName
-          ? packageData.typeServiceName
-          : null; //合作模式
+        Indexform.value.typeServiceName = packageData.typeServiceName ? packageData.typeServiceName  : ''; //合作模式
      }
      // packageCode; //包件码
      // //订单自编码
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@ -2268,12 +2268,13 @@ export default {
    },
    //确定
    callFordelivery(inde) {
-      if (this.selectionListStock.length === 0) {
+      if (!this.selectionList.length) {
+        console.log(this.selectionListStock,'23');
        this.$message.warning('至少选择一条数据！');
        return;
      }
      let isa = false;
-      this.selectionListStock.some(i => {
+      this.selectionList.some(i => {
        if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) {
          // this.$message.warning("添加数量大于可以数量");
          isa = true;
@ -2986,6 +2987,7 @@ export default {
      this.view = false;
    },
    selectionChange(list) {
+      console.log(list,'勾选的数据');
      this.selectionList = list;
    },
    handleHighlightChangeTable(row) {
--- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue
@ -447,7 +447,7 @@ export default {
          {
            prop: 'stockStatus', //需要新增字段
            label: '备货状态',
-            type: 2,
+            type: 1,
            values: '',
            width: '150',
            checkarr: [],
@ -1459,6 +1459,16 @@ export default {
        console.log('查看>>>>>库存>>', res.data.data);
        const data = res.data.data;
        this.inventorydata = data.records;
+        data.records.forEach(item=>{
+          // 备货状态 1 待备货 2 备货中  3 备货完成
+          if(item.stockStatus == 1){
+            item.stockStatus = '待备货'
+          } else if(item.stockStatus == 2){
+            item.stockStatus = '备货中'
+          }else if(item.stockStatus == 3){
+            item.stockStatus = '备货完成'
+          }
+        })
        this.inventorypage.total = data.total;
      });
    },
--- a/src/views/distribution/turndelivery/deliveryDiscuss
+++ b/src/views/distribution/turndelivery/deliveryDiscuss
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue