Merge branch 'pre-production'

src/router/views/index.js

@@ -1193,18 +1193,18 @@ export default [
     ],
   },
 
-  // {
+  {
-  //   path: '/aftersales/VueTemp',
+    path: '/aftersales/aftersalesWorkOrder',
-  //   component: Layout,
+    component: Layout,
-  //   redirect: '/aftersales/VueTemp',
+    redirect: '/aftersales/aftersalesWorkOrder',
-  //   children: [
+    children: [
-  //     {
+      {
-  //       path: '/aftersales/VueTemp',
+        path: '/aftersales/aftersalesWorkOrder',
-  //       name: '工单',
+        name: '工单',
-  //       component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
+        component: () => import('@/views/aftersales/aftersalesWorkOrder.vue'),
-  //     },
+      },
-  //   ],
+    ],
-  // },
+  },
   {
     path: '/aftersales/aftersalesWorkOrderAdd',
     component: Layout,

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -635,6 +635,7 @@ const deletePackageInfo = ref([]); //被删除的包间信息
 const unDecreaseImageEntityList = ref([]); //移除的货损图片
 const NewImageAddress = ref([]); //旧的片地址
 const InitialresponsibleParty = ref(); //初始的责任方
+const ProcessingParty =ref();//拷贝一份处理方
 const CompensationParty = ref([
   { name: '', state: 0, num: null, reason: '', cld: 1, explains: '' }, //赔款方
   { name: '', state: 1, num: null, reason: '', cld: 1, explains: '' }, //收款方
@@ -817,6 +818,7 @@ const onLoad = () => {
         Indexform.value.processor.push(item.businessId);
       }
     });
+    ProcessingParty.value = JSON.parse(JSON.stringify(Indexform.value.processor))//拷贝一份处理方
     console.log(Indexform.value.processor, ' Indexform.value.processor');
     getDictionaryBiz('pc_work_order').then(res => {
       //处理结果字典
@@ -1156,8 +1158,8 @@ const ConfirmForm = () => {
     completionRecordEntities: [], //异常工单完结赔款方
     aftersalesProcessingResultsDTO: {}, //处理结果
 
-    personResponsibleDTO: [], //添加预计责任人
+    personResponsibleDTO: [], //添加预计责任人(完成)
-    unPersonResponsibleDTO: [], //取消预计责任人
+    unPersonResponsibleDTO: [], //取消预计责任人（完成）
 
     surveyRecordDTO: {}, //调查经过
   };
@@ -1252,6 +1254,70 @@ if(unProcessorEntityList.value.length){
 }
 
 
+
+// 新增的责任方和处理方
+DataSubmit['processorEntityList'].push({
+  businessName:'',//名称
+  businessId:'',//ID
+  workOrderId:$route.query.id,//异常工单ID
+  conditions:2,//状态  1正常  2新增  3取消
+  typesOf:2,// 类型 1 责任方 2 处理方
+  processingStatus:'',//处理状态 类型 1 待处理 2 已处理
+  warehouseId:$route.query.warehouseId,//仓库ID
+  assignTime:'',//指派时间
+})
+// 取消的责任方和处理方
+DataSubmit['unProcessorEntityList'].push({
+  businessName:'',//名称
+  businessId:'',//ID
+  workOrderId:$route.query.id,//异常工单ID
+  conditions:2,//状态  1正常  2新增  3取消
+  typesOf:2,// 类型 1 责任方 2 处理方
+  processingStatus:'',//处理状态 类型 1 待处理 2 已处理
+  warehouseId:$route.query.warehouseId,//仓库ID
+  assignTime:'',//指派时间
+})
+
+
+
+
+
+
+// 新增的责任方和处理方
+  Indexform.value.processor.forEach(item=>{
+    msgData['processorEntityList'].push({
+      businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
+      businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
+      workOrderId: $route.query.id, //异常工单ID
+      conditions:2,//状态  1正常  2新增  3取消
+      typesOf: 2, //1 责任方 2 处理方
+      warehouseId: $route.query.warehouseId, //仓库ID
+      processingStatus:'',//处理状态 类型 1 待处理 2 已处理
+      assignTime:'',//指派时间
+    });
+  })
+
+// 取消的责任方和处理方
+Indexform.value.processor.forEach(item=>{
+    msgData['unProcessorEntityList'].push({
+      businessName: warehouseData.value.find(obj => obj.value == item).label, //名称
+      businessId: warehouseData.value.find(obj => obj.value == item).value, //ID
+      workOrderId: $route.query.id, //异常工单ID
+      conditions:3,//状态  1正常  2新增  3取消
+      typesOf: 2, //1 责任方 2 处理方
+      warehouseId: $route.query.warehouseId, //仓库ID
+      processingStatus:'',//处理状态 类型 1 待处理 2 已处理
+      assignTime:'',//指派时间
+    });
+  })
+
+
+
+
+
+
+
+
   //移除的货损图片
   console.log(DataSubmit, '处理好的数据');
   // $_modifyData(DataSubmit).then(res => {

src/views/distribution/deliverylist/distributionDeliveryListmar.vue

@@ -124,6 +124,13 @@
                                     <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
                                     <!--                  <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
                                     <!--              slotProps.scope.row.deliveryStatus !== '3'-->
+
+
+                                    <el-text size="small" v-if="slotProps.scope.row.deliveryStatusName !== '已完成' ||
+              slotProps.scope.row.deliveryStatus !== '3'
+              " @click="handleEdit(slotProps.scope)">编 辑
+                                    </el-text>
+
                                     <!--              " @click="handleEdit(slotProps.scope)">编 辑</el-text>-->
 
                                     <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->

src/views/distribution/turndelivery/deliveryMarket.vue

@@ -256,6 +256,7 @@
         </el-form>
     </div>
     <h3>预约列表</h3>
+    <el-button type="primary" @click="addReservation">新 增</el-button>
     <div>
         <el-row>
           <tablecmt
@@ -358,6 +359,57 @@
     </el-dialog>
 
 
+
+    <el-dialog
+            title="预约池"
+            v-model="reservationDialogVisible"
+            width="70%"
+            height="50%"
+            >
+        <el-row>
+            <tablecmt
+                    :columnList="reservationListColumnList"
+                    :tableData="reservationListData"
+                    :loading="loading"
+                    @inputTxt="inputsc"
+                    @timeCheck="timesc"
+                    @btnCheck="btnsc"
+                    @selectCheck="selectsc"
+                    @selection="selectionChange"
+            >
+                <template #default="slotProps">
+                    <el-text v-if="isoperation" type="primary" link icon="el-icon-edit" @click="removeStockArticle(slotProps.scope.row)">移除</el-text>
+                </template>
+
+            </tablecmt>
+            <el-row>
+                <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+                    <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
+                    <!-- 分页模块 -->
+                    <el-pagination
+                            align="right"
+                            background
+                            @size-change="sizeChange"
+                            @current-change="currentChange"
+                            :current-page="page.currentPage"
+                            :page-sizes="[30, 50, 80, 120]"
+                            :page-size="page.pageSize"
+                            layout="total, sizes, prev, pager, next, jumper"
+                            :total="page.total"
+                    >
+                    </el-pagination>
+                </div>
+            </el-row>
+        </el-row>
+        <span slot="footer" class="dialog-footer">
+    <el-button @click="reservationDialogVisible = false">取 消</el-button>
+    <el-button type="primary" @click="saveAddReservation">确 定</el-button>
+  </span>
+    </el-dialog>
+
+
+
+
     <el-dialog
             title="提示"
             v-model="dialogVisible"
@@ -396,7 +448,7 @@
   import { getDictionaryBiz } from '@/api/system/dict';
   import option from '@/option/distribution/distributionReservation';
   import { getListTeamInfo } from '@/api/basicdata/basicdataTeamGroup';
-  import { deliveryTask, getReservationAddr } from '@/api/distribution/distributionReservation';
+  import { deliveryTask, getList, getReservationAddr } from '@/api/distribution/distributionReservation';
   import { getMarketDeliveryList, updateMarketDelivery,cancelDeliveryListTask } from '@/api/distribution/distributionDeliveryList';
   import { getListUser } from '@/api/distribution/distributionStockup';
   import { getPostList } from '@/api/system/post';
@@ -410,6 +462,16 @@
   export default {
     data() {
       return {
+        //新增预约窗口
+        reservationDialogVisible:false,
+        //预约单查询对象
+        reservationQuery:{},
+        reservationListData:[],
+        page: {
+          currentPage: 1,
+          pageSize: 30,
+          total: 40,
+        },
         columnList: [
         {
           prop: '',
@@ -419,6 +481,16 @@
           width: 55,
           checkarr: [],
           fixed: true,
+        },
+        {
+          prop: 'reservationCode',
+          label: '预约单号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
           {
           prop: 'stockArticleId',
@@ -430,6 +502,26 @@
           fixed: false,
           sortable: true,
         },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
         {
           prop: 'consignee',
           label: '收货人',
@@ -489,6 +581,36 @@
           checkarr: [],
           fixed: false,
           sortable: true,
+        },
+          {
+            prop: 'deliveryTypeName',
+            label: '配送类型',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStatusName',
+            label: '预约单状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'stockupStatusName',
+            label: '备货状态',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
           },
           {
           prop: 'loadingStatusName',
@@ -511,8 +633,18 @@
           sortable: true,
         },
           {
-          prop: 'deliveryTypeName',
+            prop: 'reservationNum',
-          label: '配送类型',
+            label: '包件数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'reservationStockListNum',
+            label: '库存品数量',
             type: 2,
             values: '',
             width: '200',
@@ -560,9 +692,142 @@
           fixed: false,
           sortable: true,
         },
+
+
+          {
+            prop: '',
+            label: '操作',
+            type: 6,
+            values: '',
+            width: '150',
+            checkarr: [],
+            fixed: 'right',
+            hide: true,
+          },
+      ],
+        reservationListColumnList: [
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'reservationCode',
+          label: '预约单号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'stockArticleId',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+            prop: 'warehouseName',
+            label: '仓库',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+          {
+            prop: 'mallName',
+            label: '商场名称',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+        {
+          prop: 'consignee',
+          label: '收货人',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryAddress',
+          label: '收件地址',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'deliveryPhone',
+          label: '收件人电话',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'reservationDate',
+          label: '预约时间',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'periodOfTimeName',
+          label: '时段',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'deliveryWayName',
+          label: '配送方式',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+            prop: 'deliveryTypeName',
+            label: '配送类型',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
           {
             prop: 'reservationStatusName',
-          label: '预约信息状态',
+            label: '预约单状态',
             type: 2,
             values: '',
             width: '200',
@@ -579,6 +844,26 @@
             checkarr: [],
             fixed: false,
             sortable: true,
+          },
+          {
+          prop: 'loadingStatusName',
+          label: '装车状态',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+          {
+          prop: 'signingStatusName',
+          label: '签收状态',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
         },
           {
             prop: 'reservationNum',
@@ -590,6 +875,58 @@
             fixed: false,
             sortable: true,
           },
+          {
+            prop: 'reservationStockListNum',
+            label: '库存品数量',
+            type: 2,
+            values: '',
+            width: '200',
+            checkarr: [],
+            fixed: false,
+            sortable: true,
+          },
+        {
+          prop: 'collectFee',
+          label: '到付运费',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'otherFee',
+          label: '其他费用',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'replaceFee',
+          label: '代付运费',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+        {
+          prop: 'fee',
+          label: '总费用',
+          type: 2,
+          values: '',
+          width: '200',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+        },
+
+
           {
             prop: '',
             label: '操作',
@@ -757,6 +1094,50 @@
       this.onLoad(this.page);
     },
     methods: {
+      //预约单新增
+      addReservation(){
+        console.log("aaaaa-------->",'执行预约新增');
+        //开启弹窗
+        this.reservationDialogVisible = true;
+        console.log("aaaaa-------->",'aaa');
+        //查询可进行预约的预约单
+        let excludeId=[];
+        if (this.reservationData.length>0){
+          //列表存在的预约单进行过滤
+          excludeId = this.reservationData.map(item=> item.id).join(",")
+        }
+        this.getAddReservationList(this.page,excludeId);
+
+
+
+      },
+      saveAddReservation(){
+        if (this.selectionList.length === 0 ){
+          this.$message.warning("请选择需要增加的预约单");
+        }
+
+
+        this.reservationData.push(...this.selectionList);
+
+        console.log('aaa->>>>>>',this.selectionList);
+        console.log('this.reservationData->>>>>>',this.reservationData);
+        this.reservationDialogVisible = false;
+
+
+
+      },
+      //查询可用预约单
+      getAddReservationList(page,excludeId,params={}){
+        this.reservationQuery.reservationStatus = '20';
+        this.reservationQuery.excludeId = excludeId;
+        getList(page.currentPage,page.pageSize , Object.assign(params,  this.reservationQuery)).then(res=>{
+          console.log('res=========>',res);
+          const data = res.data.data;
+          this.reservationListData = data.records;
+          this.page.total = data.total;
+        })
+
+      },
       //查询叉车人员
       async getFork() {
         let ides = '';