Merge remote-tracking branch 'origin/master'

src/api/bpm/components/outsourcedWarehousing/index.js

@@ -1,39 +1,8 @@
 import request from '@/utils/request';
 
-/**
- * 列表
- */
-export async function getList (data) {
-  const res = await request.post('/aps/batchingplan/page', data);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-/**
- * 保存
- */
-export async function save (data) {
-  const res = await request.post('/aps/batchingplan/save', data);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
 
 /**
- * 修改
- */
-export async function del (data) {
-  const res = await request.delete('/aps/batchingplan/delete', { data });
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-/**
- * 发布信息返显  /
+ * 详情  
  */
 export async function getById (id) {
   const res = await request.get(`/mes/applyoutsource/getById/${id}`);
@@ -42,47 +11,10 @@ export async function getById (id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
-/**
- * 详情
- */
-export async function getPlanInfoById (id) {
-  const res = await request.get(`/aps/batchingplan/getPlanInfoById/${id}`);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-/**
- * 发布信息返显
- */
-export async function getReleaseInfoById (id) {
-  const res = await request.get(`/aps/batchingplan/getReleaseInfoById/${id}`);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-
-// 获取列表
-export async function getMaterialList(data) {
-  const res = await request.get(`/wms/outin/getRealTimeInventory`, {
-    params: data
-  });
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
-
-
-
-
 
-// 批量根据生产计划计算bom列表信息
-
-export async function listBomBySalesOrderIds(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderIds`,data);
+// 指派
+export async function outsourceAssign(data) {
+  const res = await request.post(`/bpm/outsource/assign`, data);
   if (res.data.code == 0) {
     return res.data.data;
   }
@@ -90,21 +22,13 @@ export async function listBomBySalesOrderIds(data) {
 }
 
 
-// 根据销售订单计算bom列表信息
-export async function listBomBySalesOrderId(data) {
-  const res = await request.post(`/aps/batchingplandetail/listBomBySalesOrderId`,data);
+// 不通过任务，关闭流程
+export async function outsourceNotPass(data) {
+  const res = await request.post(`/bpm/outsource/notPass`, data);
   if (res.data.code == 0) {
     return res.data.data;
   }
   return Promise.reject(new Error(res.data.message));
 }
 
-// 提交
-export async function submit(data) {
-  const res = await request.post(`/bpm/apspurchaseplan/submit`,data);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}
 

src/views/bpm/handleTask/components/outsourcedWarehousing/components/details.vue

@@ -0,0 +1,226 @@
+<template>
+    <el-dialog title="详情" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
+        :close-on-press-escape="false" append-to-body width="80%">
+
+        <!-- 数据表格 -->
+        <ele-pro-table ref="table" v-if="detailType == 1" :columns="columns" cache-key="detailsTable"
+            height="calc(100vh - 350px)">
+            <template v-slot:totalCount="{ row }">
+                {{ row.totalCount }}{{ row.measuringUnit }}
+            </template>
+        </ele-pro-table>
+
+
+        <ele-pro-table ref="table2" v-if="detailType == 2" :columns="columns2" cache-key="detailsTable2"
+            height="calc(100vh - 350px)">
+            <template v-slot:totalCount="{ row }">
+                {{ row.totalCount }}{{ row.measuringUnit }}
+            </template>
+        </ele-pro-table>
+
+
+
+    </el-dialog>
+</template>
+  
+<script>
+
+
+export default {
+    components: {
+    },
+    data() {
+        return {
+            visible: false,
+            detailType: null,
+
+        }
+    },
+
+    computed: {
+        // 表格列配置
+        columns() {
+            return [
+                {
+                    columnKey: 'index',
+                    label: '序号',
+                    type: 'index',
+                    width: 55,
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    fixed: 'left'
+                },
+
+
+                {
+                    prop: 'categoryCode',
+                    label: '编码',
+                    align: 'center'
+                },
+                {
+                    prop: 'categoryName',
+                    label: '名称',
+                    align: 'center'
+                },
+
+                {
+                    prop: 'brandNum',
+                    label: '牌号',
+                    align: 'center'
+                },
+
+
+                {
+                    prop: 'modelType',
+                    label: '型号',
+                    align: 'center'
+                },
+
+
+
+                {
+                    prop: 'specification',
+                    label: '规格',
+                    align: 'center'
+                },
+
+
+                {
+                    slot: 'totalCount',
+                    label: '数量',
+                    align: 'center'
+                },
+
+
+
+
+
+
+
+
+
+            ];
+        },
+
+        columns2() {
+            return [
+                {
+                    columnKey: 'index',
+                    label: '序号',
+                    type: 'index',
+                    width: 55,
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    fixed: 'left'
+                },
+
+
+                {
+                    prop: 'categoryCode',
+                    label: '编码',
+                    align: 'center'
+                },
+                {
+                    prop: 'categoryName',
+                    label: '名称',
+                    align: 'center'
+                },
+
+                {
+                    prop: 'brandNum',
+                    label: '牌号',
+                    align: 'center'
+                },
+
+
+                {
+                    prop: 'modelType',
+                    label: '型号',
+                    align: 'center'
+                },
+
+
+
+                {
+                    prop: 'specification',
+                    label: '规格',
+                    align: 'center'
+                },
+
+
+                {
+                    label: '物料代号',
+                    prop: 'extInfo.materielCode',
+                    align: 'center'
+                },
+                {
+                    label: '客户代号',
+                    prop: 'extInfo.clientCode',
+                    align: 'center'
+                },
+                {
+                    label: '刻码',
+                    prop: 'extInfo.engrave',
+                    align: 'center'
+                },
+
+
+                {
+                    slot: 'totalCount',
+                    label: '数量',
+                    align: 'center'
+                },
+
+
+            ];
+        },
+
+        clientEnvironmentId() {
+            return this.$store.state.user.info.clientEnvironmentId;
+        },
+    },
+
+    watch: {
+
+    },
+    methods: {
+
+
+
+        open(row) {
+            this.visible = true
+            if (row.detailType == 1) {
+                this.detailType = 1
+                this.$nextTick(() => {
+                    this.$refs.table.setData([...row.detailList]);
+                })
+            } else if (row.detailType == 2) {
+                this.detailType = 2
+                this.$nextTick(() => {
+                    this.$refs.table2.setData([...row.detailList]);
+                })
+            }
+
+
+
+        },
+
+
+
+
+
+
+
+        handleClose() {
+            this.visible = false
+
+
+
+        },
+
+    }
+}
+</script>
+  
+<style lang="scss" scoped></style>
+  

src/views/bpm/handleTask/components/outsourcedWarehousing/components/timeDialog.vue

@@ -0,0 +1,179 @@
+<template>
+    <el-dialog :title="title"  v-if="visible" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
+        :close-on-press-escape="false" append-to-body width="35%">
+
+        <el-form :model="form" ref="tableForm" class="tableForm" :rules="tableFormRules">
+            <el-button type="primary" size="small" style="margin-bottom: 10px" @click="handleAdd()"  v-if="!isDetails">新增</el-button>
+            
+             <span>&nbsp;&nbsp;&nbsp;&nbsp;委外总数： {{  totalCount }}</span>
+             
+            <el-table ref="multipleTable" :data="form.timeList" tooltip-effect="dark" style="width: 100%" stripe
+                :header-cell-style="{ background: '#EEEEEE', border: 'none' }">
+
+
+
+                <el-table-column label="数量" prop="purchaseQuantity">
+                    <template slot-scope="{ row, $index }">
+                        <el-form-item :prop="'timeList.' + $index + '.purchaseQuantity'"
+                            :rules="tableFormRules.purchaseQuantity">
+                            <el-input placeholder="请输入" clearable v-model="row.purchaseQuantity"></el-input>
+                        </el-form-item>
+
+                    </template>
+                </el-table-column>
+
+
+
+                <el-table-column label="到货时间">
+                    <template slot-scope="{ row, $index }">
+                        <el-form-item :prop="'timeList.' + $index + '.requireDeliveryTime'"
+                            :rules="tableFormRules.requireDeliveryTime">
+                            <el-date-picker clearable v-model="row.requireDeliveryTime" value-format="timestamp"
+                                placeholder="请选择日期">
+                            </el-date-picker>
+                        </el-form-item>
+                    </template></el-table-column>
+
+                <el-table-column label="操作" prop="action" width="80" v-if="!isDetails">
+                    <template slot-scope="{ $index }">
+                        <el-link type="primary" :underline="false" @click="handleDel($index)">删除</el-link>
+                    </template>
+                </el-table-column>
+
+
+            </el-table>
+
+        </el-form>
+
+
+
+
+        <div class="btns" v-if="!isDetails">
+            <el-button type="primary" size="small" @click="handleOk">确认</el-button>
+            <el-button size="small" @click="handleClose">取消</el-button>
+        </div>
+    </el-dialog>
+</template>
+  
+<script>
+
+
+
+
+export default {
+    components: {
+    },
+
+    props: {
+    
+    },
+    data() {
+        return {
+            visible: false,
+            title: '设置分批时间',
+
+            current: null,
+            form: {
+                timeList: [
+                    {
+                        requireDeliveryTime: null,
+                        purchaseQuantity: null
+                    }
+                ]
+            },
+
+            tableFormRules: {
+                purchaseQuantity: {
+                    required: true,
+                    message: '请输入数量',
+                    trigger: 'blur'
+                },
+
+                requireDeliveryTime: {
+                    required: true,
+                    message: '请选择日期',
+                    trigger: 'change'
+                }
+            },
+
+            totalCount: 0,
+            isDetails: false
+
+        
+
+
+        }
+    },
+
+    watch: {
+
+    },
+    methods: {
+
+
+
+        open(row, type) {
+        
+            this.totalCount = row.totalCount
+            this.form.timeList = []
+
+            this.visible = true
+            this.isDetails = false
+            if(type == 'details') {
+                this.form.timeList = row.timeList
+                this.isDetails = true
+                this.$forceUpdate()
+            }
+           
+
+        },
+
+
+        handleAdd() {
+            this.form.timeList.push({
+                requireDeliveryTime: null,
+                purchaseQuantity: null
+            })
+        },
+
+        handleDel(index) {
+            this.form.timeList.splice(index, 1)
+        },
+
+
+
+        handleOk() {
+            this.$refs.tableForm.validate((valid) => {
+                if (valid) {
+                    this.$emit('chooseTime', this.form.timeList)
+                    this.handleClose()
+                }
+            })
+        },
+
+
+
+
+        handleClose() {
+            this.visible = false
+            this.form.timeList = [{
+                requireDeliveryTime: null,
+                purchaseQuantity: null
+            }];
+        },
+
+    }
+}
+</script>
+  
+<style lang="scss" scoped>
+.btns {
+    margin-top: 20px;
+    text-align: center;
+}
+
+.el-form-item {
+    margin-bottom: 20px !important;
+}
+</style>
+  

src/views/bpm/handleTask/components/outsourcedWarehousing/detailDialog.vue

@@ -3,24 +3,78 @@
 
     <headerTitle title="委外入库申请单"></headerTitle>
 
+    <!-- 数据表格 -->
+    <ele-pro-table ref="table" :columns="columns"    row-key="id" cache-key="outsourcedWarehousing">
 
 
-      <ele-pro-table ref="table" :needPage="false" :columns="columns" row-key="id">
- 
-      </ele-pro-table>
+      <template v-slot:requireDeliveryTime="{ row }">
+        <span v-if="row.deliveryMethod == 1">{{ row.requireDeliveryTime }}</span>
 
+        <el-link v-if="row.deliveryMethod == 2" type="primary" :underline="false"
+          @click.native="handleMethod(row)">分批时间</el-link>
 
+      </template>
+
+
+      <template v-slot:status="{ row }">
+        <el-tag>{{ row.status == 1 ? '已发布' : '未发布' }}</el-tag>
+      </template>
+
+
+      <template v-slot:technicalDrawings="{ row }">
+
+        <div v-if="row.technicalDrawings && row.technicalDrawings?.length">
+          <el-link v-for="link in row.technicalDrawings" :key="link.id" type="primary" :underline="false"
+            @click="downloadFile(link)">
+            {{ link.name }}</el-link>
+        </div>
+
+      </template>
+
+
+      <template v-slot:files="{ row }">
+        <div v-if="row.files && row.files?.length">
+          <el-link v-for="link in row.files" :key="link.id" type="primary" :underline="false" @click="downloadFile(link)">
+            {{ link.name }}</el-link>
+        </div>
+
+      </template>
+
+
+      <template v-slot:action="{ row }">
+
+
+        <el-link type="primary" :underline="false" @click="handleDetails(row)">
+          详情
+        </el-link>
+
+
+
+
+
+
+      </template>
+
+
+    </ele-pro-table>
+
+    <detail ref="detailsRef"></detail>
+
+    <timeDialog ref="timeDialogRef"></timeDialog>
 
   </div>
 </template>
   
 <script>
 import { getById } from '@/api/bpm/components/outsourcedWarehousing/index';
-import { getFile } from '@/api/system/file';
+import Detail from './components/details.vue';
+import timeDialog from './components/timeDialog.vue'
+import { getFile } from "@/api/system/file";
 
 export default {
   components: {
-
+    Detail,
+    timeDialog
   },
   props: {
     businessId: {
@@ -32,111 +86,117 @@ export default {
   data() {
     return {
       visible: false,
-      title: '采购配料计划',
+
 
       // 表格列配置
       columns: [
-    
-      {
-                    columnKey: 'index',
-                    label: '序号',
-                    type: 'index',
-                    width: 55,
-                    align: 'center',
-                    showOverflowTooltip: true,
-                    fixed: 'left'
-                },
-                {
-                    prop: 'id',
-                    label: '委外单id',
-                    align: 'center',
-                    minWidth: 110
-                },
-
-                {
-                    prop: 'code',
-                    label: '委外编码',
-                    align: 'center'
-                },
-                {
-                    prop: 'name',
-                    label: '委外名称',
-                    align: 'center'
-                },
-
-                {
-                    prop: 'workOrderId',
-                    label: '工单id',
-                    align: 'center'
-                },
-
-
-                {
-                    prop: 'workOrderCode',
-                    label: '工单编码',
-                    align: 'center'
-                },
-                {
-                    prop: 'formedNumLast',
-                    label: '委外数量',
-                    align: 'center'
-                },
-
-                {
-                    prop: 'formedWeightLast',
-                    label: '委外重量',
-                    align: 'center'
-                },
-
-                {
-                    prop: 'totalWeight',
-                    label: '总重量',
-                    align: 'center'
-                },
-
-                
-                {
-                    prop: 'warehouseName',
-                    label: '入库仓库',
-                    align: 'center'
-                },
-
-
-                {
-                    prop: 'remark',
-                    label: '备注',
-                    align: 'center'
-                },
-
-                {
-                    prop: 'expectReceiveDate',
-                    label: '预计到货日期',
-                    align: 'center',
-                    showOverflowTooltip: true,
-                    minWidth: 110
-                },
-
-
-                {
-                    prop: 'createTime',
-                    label: '创建时间',
-                    align: 'center',
-                    showOverflowTooltip: true,
-                    minWidth: 110
-                },
-
-
-                
-                {
-                    columnKey: 'action',
-                    label: '操作',
-                    width: 120,
-                    align: 'center',
-                    resizable: false,
-                    fixed: 'right',
-                    slot: 'action',
-                    showOverflowTooltip: true
-                }
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+
+
+        {
+          prop: 'code',
+          label: '委外单编码',
+          align: 'center'
+        },
+        {
+          prop: 'name',
+          label: '委外单名称',
+          align: 'center'
+        },
+
+
+        {
+          prop: 'workOrderCode',
+          label: '工单编码',
+          align: 'center'
+        },
+
+
+
+        {
+          prop: 'taskName',
+          label: '工序',
+          align: 'center'
+        },
+
+
+        {
+          prop: 'totalCount',
+          label: '委外数量',
+          align: 'center'
+        },
+
+        {
+          prop: 'totalWeight',
+          label: '委外重量',
+          align: 'center'
+        },
+
+
+        {
+          prop: 'remark',
+          label: '备注',
+          align: 'center'
+        },
+
+        {
+          slot: 'requireDeliveryTime',
+          label: '预计到货日期',
+          align: 'center',
+          minWidth: 70
+        },
+
+
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          minWidth: 70
+        },
+
+        {
+          slot: 'status',
+          label: '状态',
+          align: 'center'
+        },
+
+
+        {
+          label: '图片附件',
+          slot: 'technicalDrawings',
+          action: 'technicalDrawings',
+          minWidth: 100,
+        },
+
+        {
+          label: '附件',
+          slot: 'files',
+          action: 'files',
+          minWidth: 100,
+        },
+
+
+
+        {
+          columnKey: 'action',
+          label: '操作',
+          width: 140,
+          align: 'center',
+          resizable: false,
+          fixed: 'right',
+          slot: 'action',
+          showOverflowTooltip: true
+        }
+
+
 
 
       ],
@@ -144,12 +204,7 @@ export default {
 
       rules: {},
 
-      formData: {
-        name: '',
-        remark: '',
-        detailRemoveIds: [],
-        materialRemoveIds: []
-      }
+
     };
   },
   created() {
@@ -157,16 +212,19 @@ export default {
   },
   methods: {
 
+    downloadFile(file) {
+      getFile({ objectName: file.storePath }, file.name);
+    },
+
+
+
     async getDetailData(id) {
       this.loading = true;
       const res = await getById(id);
-      console.log(33,res)
+
       this.loading = false;
       if (res) {
-        this.$set(this.formData, 'name', res.name);
-        this.$set(this.formData, 'remark', res.remark);
-        this.formData['id'] = res.id;
-        this.$refs.table.setData([...res.salesOrderList]);
+        this.$refs.table.setData([res]);
         this.$nextTick(() => {
           this.$refs.table.toggleRowExpansionAll()
           this.$forceUpdate()
@@ -174,9 +232,14 @@ export default {
       }
     },
 
+    handleDetails(row) {
+      this.$refs.detailsRef.open(row)
+    },
+
     handleMethod(row) {
-      this.$refs.timeDialogRef.open(row)
+      this.$refs.timeDialogRef.open(row, 'details')
     },
+
   }
 };
 </script>

src/views/bpm/handleTask/components/outsourcedWarehousing/submit.vue

@@ -1,16 +1,18 @@
 <template>
   <el-col :span="16" :offset="6">
     <el-form label-width="100px" ref="formRef" :model="form">
-      <el-form-item label="采购员" prop="technicianId" style="margin-bottom: 20px" :rules="{
-        required: true,
-        message: '请选择',
-        trigger: 'change'
-      }">
+      <el-form-item label="采购员" v-if="taskDefinitionKey == 'purchaseLeader'" prop="technicianId"
+        style="margin-bottom: 20px" :rules="{
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        }">
         <el-select v-model="form.technicianId" clearable style="width: 100%" :filterable="true">
           <el-option v-for="item in userOptions" @click.native="form.userName = item.name" :key="item.id"
             :label="item.name" :value="item.id" />
         </el-select>
       </el-form-item>
+
       <el-form-item label="审批建议" prop="reason" style="margin-bottom: 20px" :rules="{
         required: true,
         message: '请选择',
@@ -26,14 +28,6 @@
       <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleAudit(0)">驳回
       </el-button>
 
-      <el-dropdown @command="(command) => handleCommand(command)" style="margin-left: 30px;">
-        <span class="el-dropdown-link">更多<i class="el-icon-arrow-down el-icon--right"></i></span>
-        <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item command="cancel">作废</el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
-
-
     </div>
 
   </el-col>
@@ -41,9 +35,10 @@
 
 <script>
 
-import { apspurchaseplan, cancel } from '@/api/bpm/components/apsMeterialPlan';
+
 import { approveTaskWithVariables } from '@/api/bpm/task';
 import { listAllUserBind } from '@/api/system/organization';
+import { outsourceAssign, outsourceNotPass } from '@/api/bpm/components/outsourcedWarehousing/index';
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -72,35 +67,60 @@ export default {
         technicianId: '',
         reason: ''
       },
+
       userOptions: []
+
     };
   },
   created() {
-    this.userOptions = [];
-    listAllUserBind().then((data) => {
-      this.userOptions.push(...data);
-    });
+    if (this.taskDefinitionKey == 'purchaseLeader')
+      this.userOptionsFn()
   },
   methods: {
 
+    userOptionsFn() {
+      this.userOptions = [];
+      listAllUserBind().then((data) => {
+        this.userOptions.push(...data);
+      });
+    },
 
-    async handleAudit(status, type) {
-      //生产主管审批选择技术员
+    async handleAudit(status) {
 
-      if (!this.form.technicianId && status == 1) {
-        this.$message.warning(`请选择采购员！`);
-        return;
+      if (this.taskDefinitionKey == 'purchaseLeader') {
+        this._approveTaskPurchaseLeader(status)
+      } else {
+        this._approveTaskWithVariables(status);
       }
 
 
-      this._approveTaskWithVariables(status);
     },
     async _approveTaskWithVariables(status) {
+      let variables = {
+        pass: !!status
+      };
+
+      approveTaskWithVariables({
+        id: this.taskId,
+        reason: this.form.reason,
+        variables
+      }).then((res) => {
+        if (res.data.code != '-1') {
+          this.$emit('handleAudit', {
+            status,
+            title: status === 0 ? '驳回' : ''
+          });
+        }
+      });
+    },
+
+
+    async _approveTaskPurchaseLeader(status) {
 
 
       if (status == 1) {
 
-        apspurchaseplan({
+        outsourceAssign({
           businessId: this.businessId,
           id: this.taskId,
           userId: this.form.technicianId,
@@ -109,58 +129,28 @@ export default {
           pass: true
 
         }).then((res) => {
-          if (res.data.code != '-1') {
-            this.$emit('handleAudit', {
+          this.$emit('handleAudit', {
               status,
               title: ''
             });
-          }
         });
       } else if (status == 0) {
-        approveTaskWithVariables({
+        outsourceNotPass({
           id: this.taskId,
           reason: this.form.reason,
           pass: false
         }).then((res) => {
-          if (res.data.code != '-1') {
-            this.$emit('handleAudit', {
+          this.$emit('handleAudit', {
               status,
               title: '驳回'
             });
-          }
         });
       }
 
     },
 
-    getTableValue() {
-      return new Promise((resolve, reject) => {
-        this.$emit('getTableValue', async (data) => {
-          resolve(await data);
-        });
-      });
-    },
 
-    //更多
-    handleCommand(command) {
-      if (command === 'cancel') {
-        this.$confirm("是否确认作废？", {
-          type: 'warning',
-          cancelButtonText: '取消',
-          confirmButtonText: '确定'
-        }).then(() => {
-          cancel({
-            id: this.taskId,
-            reason: this.form.reason,
-            businessId: this.businessId,
-          }).then(() => {
-            this.$emit('handleClose');
-          }).catch(() => {
-            this.$message.error("流程作废失败");
-          });
-        }).catch(() => {});
-      }
-    },
+
 
   }
 };