feat(退货流程): 新增采购单展示

src/enum/dict.js

@@ -118,7 +118,7 @@ export const acceptUnpackoptions = [
 //发货审核状态
 export const reviewStatusEnum = [
   { value: 0, label: '未提交' },
-  { value: 1, label: '待审核' },
+  { value: 1, label: '审核中' },
   { value: 2, label: '已审核' },
   { value: 3, label: '审核未通过' }
 ];
@@ -132,8 +132,10 @@ export const reviewStatus = {
   0: '未提交',
   1: '审核中',
   2: '已审核',
-  3: '审核不通过'
+  3: '审核不通过',
+  7: '作废'
 };
+
 //项目管理——项目、计划、任务状态
 export const proStatusEnum = [
   { value: 0, label: '未开始' },
@@ -314,3 +316,15 @@ export const topLevel2 = [
     value: '9'
   }
 ];
+
+
+//采购订单整体进度
+export const purchaseOrderProgressStatusEnum = [
+  { value: 0, label: '未开始' },
+  { value: 100, label: '在途' },
+  { value: 101, label: '部分入库' },
+  { value: 102, label: '待质检' },
+  { value: 103, label: '质检中' },
+  { value: 200, label: '已入库' },
+  { value: 1000, label: '完成' }
+];

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/customerReturnOrder.vue

@@ -116,7 +116,7 @@
         <!--  ///  仓管入库展示字段 -->
         <template v-slot:ifPackageOk="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.ifPackageOk'" :rules="{
-            required: true,
+            required: false,
             trigger: 'change',
             message: '请选择包装完好与否'
           }">
@@ -129,11 +129,11 @@
           </el-form-item>
         </template>
         <template v-slot:headerIfPackageOk="{ column }">
-          <span class="is-required">{{ column.label }}</span>
+          <span>{{ column.label }}</span>
         </template>
         <template v-slot:unpackUserName="{ row, $index }">
           <el-form-item :prop="'detailList.' + $index + '.unpackUserName'" :rules="{
-            required: true,
+            required: false,
             trigger: 'change',
             message: '请选择拆包装责任人'
           }">
@@ -143,7 +143,7 @@
           </el-form-item>
         </template>
         <template v-slot:headerUnpackUserName="{ column }">
-          <span class="is-required">{{ column.label }}</span>
+          <span>{{ column.label }}</span>
         </template>
         <!--////-->
         <!--  ///  质检员审核展示字段 -->
@@ -603,25 +603,25 @@ export default {
           }
         ],
         //质量部主管指派
-        QCLeader: [
-          {
-            minWidth: 140,
-            prop: 'ifPackageOk',
-            label: '包装完好与否',
-            align: 'center',
-            slot: 'ifPackageOk',
-            headerSlot: 'headerIfPackageOk'
-          },
-          {
-            minWidth: 140,
-            prop: 'unpackUserName',
-            label: '拆包装责任人',
-            align: 'center',
-            slot: 'unpackUserName',
-            headerSlot: 'headerUnpackUserName'
-          }
-        ],
-        //质检员审核
+        // QCLeader: [
+        //   {
+        //     minWidth: 140,
+        //     prop: 'ifPackageOk',
+        //     label: '包装完好与否',
+        //     align: 'center',
+        //     slot: 'ifPackageOk',
+        //     headerSlot: 'headerIfPackageOk'
+        //   },
+        //   {
+        //     minWidth: 140,
+        //     prop: 'unpackUserName',
+        //     label: '拆包装责任人',
+        //     align: 'center',
+        //     slot: 'unpackUserName',
+        //     headerSlot: 'headerUnpackUserName'
+        //   }
+        // ],
+        //质检员审核  
         QCApprove: [
           {
             minWidth: 250,

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/customerReturnOrderDialog.vue

@@ -131,13 +131,13 @@
             name: '销售主管审批',
             isShow: true
           },
-          {
-            key: 'storeman',
-            permissionType: 'update',
-            isShowReturnOrder: true,
-            name: '仓管入库',
-            isShow: true
-          },
+          // {
+          //   key: 'storeman',
+          //   permissionType: 'update',
+          //   isShowReturnOrder: true,
+          //   name: '仓管入库',
+          //   isShow: true
+          // },
           {
             key: 'QCLeader',
             permissionType: 'view',

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/purchaseList.vue

@@ -0,0 +1,460 @@
+<template>
+  <div>
+    <ele-pro-table
+      ref="table"
+      :needPage="false"
+      :datasource="tableList"
+      :columns="columns"
+    >
+    </ele-pro-table>
+  </div>
+</template>
+<script>
+  import { getTableList } from '@/api/bpm/components/purchasingManage/purchaseOrder';
+  import { purchaseOrderProgressStatusEnum, reviewStatus } from '@/enum/dict';
+  export default {
+    props: {
+      relationId: {
+        default: () => []
+      }
+    },
+    watch: {
+      relationId(val) {
+        // alert(1)
+        if (val.length) {
+          this.productionplanByIds();
+        }
+      }
+    },
+    data() {
+      return {
+        tableList:[],
+        // columns: [
+        //   {
+        //     columnKey: 'index',
+        //     label: '序号',
+        //     type: 'index',
+        //     width: 55,
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     slot: 'batchNo',
+        //     prop: 'batchNo',
+        //     label: '批次号',
+        //     align: 'center',
+        //     minWidth: 140,
+        //     sortable: true
+        //   },
+
+        //   {
+        //     slot: 'code',
+        //     prop: 'code',
+        //     action: 'code',
+        //     label: '计划编号',
+        //     align: 'center',
+
+        //     minWidth: 160,
+        //     sortable: true
+        //   },
+
+        //   {
+        //     prop: 'salesCode',
+        //     action: 'salesCode',
+        //     label: '销售订单号',
+        //     align: 'center',
+        //     minWidth: 160
+        //   },
+
+        //   {
+        //     prop: 'productCode',
+        //     label: '编码',
+        //     align: 'center',
+
+        //     minWidth: 140
+        //   },
+        //   {
+        //     prop: 'productName',
+        //     label: '名称',
+        //     align: 'center',
+
+        //     minWidth: 140
+        //   },
+
+        //   {
+        //     prop: 'brandNo',
+        //     label: '牌号',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'specification',
+        //     label: '规格',
+        //     align: 'center',
+        //     minWidth: 150,
+
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'model',
+        //     label: '型号',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     prop: 'produceRoutingName',
+        //     label: '工艺路线',
+        //     align: 'center',
+        //     width: 140,
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'productNum',
+        //     label: '计划数量',
+        //     align: 'center',
+
+        //     slot: 'productNum'
+        //   },
+        //   {
+        //     prop: 'productWeight',
+        //     label: '计划重量',
+        //     align: 'center',
+
+        //     slot: 'productWeight'
+        //   },
+        //   {
+        //     prop: 'requiredFormingNum',
+        //     label: '要求生产数量',
+        //     align: 'center',
+
+        //     slot: 'requiredFormingNum'
+        //   },
+
+        //   {
+        //     prop: 'newSumOrderWeight',
+        //     label: '要求生产重量',
+        //     align: 'center',
+
+        //     slot: 'newSumOrderWeight'
+        //   },
+
+        //   {
+        //     prop: 'scheduleStatusName',
+        //     label: '进度状态',
+        //     align: 'center',
+        //     minWidth: 100
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '已排产数量',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '未排产数量',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '已生产数量',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '未生产数量',
+        //     align: 'center',
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'factoryName',
+        //     label: '所属工厂',
+        //     align: 'center'
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '合格品数',
+        //     align: 'center'
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '不合格品数',
+        //     align: 'center'
+        //   },
+
+        //   {
+        //     prop: '',
+        //     label: '合格率',
+        //     align: 'center'
+        //   },
+
+        //   {
+        //     prop: 'reqMoldTime',
+        //     label: '计划完成日期',
+        //     align: 'center',
+        //     width: 110,
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'startTime',
+        //     label: '计划开始日期',
+        //     align: 'center',
+        //     width: 110,
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'endTime',
+        //     label: '计划结束日期',
+        //     align: 'center',
+        //     width: 110,
+        //     showOverflowTooltip: true
+        //   },
+
+        //   {
+        //     prop: 'version',
+        //     label: '版本',
+        //     align: 'center',
+
+        //     minWidth: 80
+        //   },
+        //   {
+        //     prop: 'createTime',
+        //     label: '创建时间',
+        //     align: 'center',
+        //     width: 110,
+        //     showOverflowTooltip: true
+        //   },
+        //   {
+        //     columnKey: 'status',
+        //     slot: 'status',
+        //     label: '状态',
+        //     align: 'center'
+        //   }
+        // ]
+
+        columns: [
+        // {
+        //   width: 45,
+        //   type: 'selection',
+        //   columnKey: 'selection',
+        //   align: 'center'
+        // },
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+        {
+          prop: 'orderNo',
+          label: '订单编码',
+          align: 'center',
+          sortable: true,
+          slot: 'orderNo',
+          showOverflowTooltip: true,
+          minWidth: 200,
+          fixed: 'left'
+        },
+        {
+          prop: 'sourceTypeName',
+          label: '订单类型',
+          align: 'center',
+          sortable: true,
+          showOverflowTooltip: true,
+          minWidth: 200,
+          fixed: 'left'
+        },
+        {
+          prop: 'progress',
+          label: '订单进度',
+          align: 'center',
+          showOverflowTooltip: true,
+          formatter: (_row, _column, cellValue) => {
+            return purchaseOrderProgressStatusEnum.find(
+              (val) => val.value == _row.progress
+            )?.label;
+          },
+          minWidth: 120
+        },
+
+        {
+          prop: 'relationType',
+          label: '来源单据类型',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 150,
+          formatter: (_row, _column, cellValue) => {
+            return _row.relationType == 1
+              ? '采购需求单'
+              : _row.relationType == 2
+              ? '采购计划单'
+              : _row.relationType == 3
+              ? '采购核价单'
+              : _row.relationType == 4
+              ? '采购合同'
+              : '';
+          }
+        },
+        {
+          prop: 'relationName',
+          label: '来源单据',
+          align: 'center',
+          slot: 'relationName',
+          showOverflowTooltip: true,
+          minWidth: 250
+        },
+        {
+          prop: 'partaName',
+          label: '采购方名称',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 200
+        },
+        {
+          prop: 'partaLinkName',
+          label: '采购方联系人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130
+        },
+
+        {
+          prop: 'partaTel',
+          label: '采购方联系电话',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130
+        },
+        {
+          prop: 'productNames',
+          label: '名称',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 200
+        },
+        {
+          prop: 'productCodes',
+          label: '编码',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'batchNos',
+          label: '批次号',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'productCount',
+          label: '数量',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'inboundCount',
+          label: '收货数量',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+
+        {
+          prop: 'partbName',
+          label: '供应商名称',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 250
+        },
+        {
+          prop: 'partbLinkName',
+          label: '供应商联系人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 120
+        },
+        {
+          prop: 'partbTel',
+          label: '供应商联系电话',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130
+        },
+        {
+          prop: 'isInspection',
+          label: '是否来料检',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 130,
+          formatter: (_row, _column, cellValue) => {
+            return cellValue == 1 ? '是' : '否';
+          }
+        },
+        {
+          prop: 'payAmount',
+          label: '金额(元)',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 140
+        },
+        {
+          prop: 'createUserName',
+          label: '创建人',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 170
+        },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 170
+        },
+        {
+          prop: 'orderStatus',
+          label: '审核状态',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 100,
+          formatter: (_row, _column, cellValue) => {
+            return reviewStatus[_row.orderStatus];
+          }
+        },
+      ],
+      };
+    },
+    computed: {},
+    created() {
+      this.productionplanByIds()
+    },
+    methods: {
+      productionplanByIds(){
+        
+        getTableList({relationId:this.relationId}).then(res=>{
+          this.tableList=res
+        })
+      }
+    }
+  };
+</script>
+<style lang="scss" scoped></style>

src/views/bpm/handleTask/components/saleOrder/customerReturnGoods/repair-tabs-page.vue

@@ -29,10 +29,14 @@
     name: 'repairTabsPage',
     components: {
       // outerStoremanOut: () => import('./outboundToOutsourcing.vue'),
+      // outerStoremanOut: () =>
+      //   import('@/views/bpm/outgoingManagement/outbound.vue'),
+      // outerStoremanOutDetails: () =>
+      //   import('@/views/bpm/outgoingManagement/details.vue'),
       outerStoremanOut: () =>
-        import('@/views/bpm/outgoingManagement/outbound.vue'),
+        import('@/views/bpm/handleTask/components/saleOrder/customerReturnGoods/purchaseList.vue'),
       outerStoremanOutDetails: () =>
-        import('@/views/bpm/outgoingManagement/details.vue'),
+        import('@/views/bpm/handleTask/components/saleOrder/customerReturnGoods/purchaseList.vue'),
       // outerStoremanIn: () => import('./interiorStorageToOutsourcing.vue'),
       outerStoremanIn: () => import('@/views/bpm/stockManagement/storage.vue'),
       outerStoremanInDetails: () =>
@@ -121,7 +125,7 @@
           //   isOutOrIn: 'innerStore'
           // },
           {
-            label: '物品出库给外协',
+            label: '采购单',
             name: 'outerStoremanOut',
             isOutOrIn: 'outerStore'
           },
@@ -176,12 +180,13 @@
               bizType: 6,
               sourceBizNo: this.form.returnHandleNo,
               detailList: this.detailList,
-              
+              relationId: this.form.outerOutReceiptId
             };
           case 'outerStoremanOutDetails':
             return {
               businessId: this.form.outerOutReceiptId,
-              isIds: true
+              isIds: true,
+              relationId: this.form.outerOutReceiptId
             };
 
           case 'outerInQC':

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -159,6 +159,7 @@
         :sourceBizNo="form.returnNo"
         :detailList="form?.productList?.filter((item) => item.packageId)"
         :saleProductList="form?.productList?.filter((item) => !item.packageId)"
+        :isShowPackage="true"
         :bizType="6"
         :isMoreProduct="true"
       ></add>

src/views/bpm/stockManagement/storage.vue

@@ -222,6 +222,50 @@
                 :prop="item.prop"
                 :show-overflow-tooltip="item.showOverflowTooltip"
               ></el-table-column>
+
+              <el-table-column
+                label="包装完好与否"
+                align="center"
+                width="100"
+                prop="ifPackageOk"
+              > 
+                <template slot-scope="{ row, $index }">
+                  <template v-if="row.isSave">
+                    {{ row.ifPackageOk ? '是' : '否' }}
+                  </template>
+                  <el-form-item
+                    v-else
+                    :prop="`productList.${$index}.ifPackageOk`"
+                    required
+                  >
+                    <el-select v-model="row.ifPackageOk" placeholder="请选择" clearable style="width: 100%">
+                      <el-option label="是" :value="1" />
+                      <el-option label="否" :value="0" />
+                    </el-select>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+              <el-table-column
+                label="拆包装责任人"
+                align="center"
+                width="100"
+                prop="unpackUserName"
+              >
+                <template slot-scope="{ row, $index }">
+                  <template v-if="row.isSave">
+                    {{ row.unpackUserName }}
+                  </template>
+                  <el-form-item
+                    v-else
+                    :prop="`productList.${$index}.unpackUserName`"
+                    required
+                  >
+                    <el-input @click.native="handHead(row, $index)" v-model="row.unpackUserName"
+              placeholder="请选择"></el-input>
+                  </el-form-item>
+                </template>
+              </el-table-column>
+
               <el-table-column
                 label="批次号"
                 align="center"
@@ -1155,6 +1199,8 @@
       ref="wareHouseDailogRef"
       @selection="wareHouseSelection"
     ></WarehousingDialog>
+    <!-- 包装负责人 -->
+    <head-list ref="headRef" @changeParent="changeHead"></head-list>
     <!-- 生产日期、采购日期弹框 -->
     <el-dialog
       :visible.sync="dateVisible"
@@ -1198,12 +1244,14 @@
   import { deepClone } from '@/utils';
   import { mapActions, mapGetters } from 'vuex';
   import BigNumber from 'bignumber.js';
+  import headList from '@/components/headList';
 
   // import dictMixins from '@/mixins/dictMixins';
   export default {
     components: {
       selectType,
-      WarehousingDialog
+      WarehousingDialog,
+      headList
     },
     // mixins: [dictMixins],
     // 虚拟列表滚动方法
@@ -1218,7 +1266,8 @@
       saleProductList: { type: Array, default: () => [] },
       detailProductList: { type: Array, default: () => [] },
       isMoreProduct: { type: Boolean, default: false }, //多产品包装明细
-      processInstance: { type: Object, default: () => {} }
+      processInstance: { type: Object, default: () => {} },
+      isShowPackage: { type: Boolean, default: false }  //售后退货单仓管审批显示
     },
     data() {
       return {
@@ -2148,6 +2197,18 @@
           if (obj[key] < 10) obj[key] = `0${obj[key]}`;
         });
         return obj;
+      },
+       //选择负责人
+      handHead(row, index) {
+        let item = {
+          id: row.unpackUserId
+        };
+        this.$refs.headRef.open(item, index);
+      },
+      //选择负责人回调
+      changeHead(obj, index) {
+        this.$set(this.productList[index], 'unpackUserId', obj.id);
+        this.$set(this.productList[index], 'unpackUserName', obj.name);
       },
       // 赋值入库时间
       getNowFormatDate() {
@@ -2860,8 +2921,13 @@
               `productList.${index}.batchNo`,
               `productList.${index}.packingQuantity`,
               `productList.${index}.packingUnit`,
-              `productList.${index}.warehouseId`
+              `productList.${index}.warehouseId`,
+              
             ];
+            if(this.isShowPackage) {
+              fileds.push(`productList.${index}.unpackUserName`,
+              `productList.${index}.ifPackageOk`,)
+            }
             if (row.isSave) {
               return Promise.resolve(true);
             } else {