优化

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

@@ -33,10 +33,10 @@ export async function del (data) {
 }
 
 /**
- * 发布信息返显
+ * 发布信息返显  /
  */
 export async function getById (id) {
-  const res = await request.get(`/aps/batchingplan/getById/${id}`);
+  const res = await request.get(`/mes/applyoutsource/getById/${id}`);
   if (res.data.code == 0) {
     return res.data.data;
   }

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

@@ -2,97 +2,25 @@
   <div>
 
     <headerTitle title="委外入库申请单"></headerTitle>
-    <el-form :model="formData" ref="formRef" label-width="120px" class="ele-body" :rules="rules">
-      <el-row :gutter="32">
-        <el-col :span="12">
-          <el-form-item label="配料计划名称" prop="name">
-            <el-input placeholder="请选择" v-model="formData.name"></el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark">
-            <el-input placeholder="备注" v-model="formData.remark"></el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <el-form :model="formData" ref="tableForm">
-      <ele-pro-table ref="table" :needPage="false" :columns="columns" row-key="id">
-        <!-- 展开内容 -->
-        <template v-slot:expand="{ row }">
-          <div style="
-              width: calc(100% - 95px);
-              min-height: 60px;
-              margin-left: 95px;
-            " v-if="row.materialList.length > 0">
-            <ele-pro-table :toolbar="false" toolsTheme="none" ref="table2" :need-page="false"
-              :datasource="row.materialList" :columns="columns2" row-key="id">
-              <template v-slot:sort="{ $index }">
-                {{ $index }}
-              </template>
-
-              <template v-slot:deliveryMethod="{ row }">
-                {{ row.deliveryMethod == 1 ? '一次性到货' : '分批到货' }}
-              </template>
-
-              <template v-slot:requireDeliveryTime="{ row }">
-                <span v-if="row.deliveryMethod == 1">{{ row.requireDeliveryTime }}</span>
-
-
-                <el-link type="primary" :underline="false" v-if="row.deliveryMethod == 2"
-                  @click.native="handleMethod(row)">
-                  设置分批时间
-                </el-link>
-              </template>
-
-              
-
-
-
-
-
-
-              <template v-slot:imgUrl="{ row }">
-                <div v-if="row.imgUrl && row.imgUrl?.length">
-                  <el-link v-for="link in row.imgUrl" :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>
-
 
 
 
+      <ele-pro-table ref="table" :needPage="false" :columns="columns" row-key="id">
+ 
+      </ele-pro-table>
 
 
-            </ele-pro-table>
-          </div>
-        </template>
-      </ele-pro-table>
-    </el-form>
 
-    <timeDialog ref="timeDialogRef"></timeDialog>
   </div>
 </template>
   
 <script>
 import { getById } from '@/api/bpm/components/outsourcedWarehousing/index';
 import { getFile } from '@/api/system/file';
-import timeDialog from './timeDialog'
 
 export default {
   components: {
-    timeDialog
+
   },
   props: {
     businessId: {
@@ -108,184 +36,111 @@ export default {
 
       // 表格列配置
       columns: [
-        {
-          width: 45,
-          type: 'expand',
-          columnKey: 'materialList',
-          align: 'center',
-          slot: 'expand'
-        },
-
-        {
-          width: 50,
-          label: '序号',
-          type: 'index',
-          align: 'center',
-          slot: 'index'
-        },
-
-        {
-          prop: 'salesOrderCode',
-          label: '销售订单号',
-          showOverflowTooltip: true,
-          align: 'center',
-          minWidth: 170
-        },
-        {
-          prop: 'customerName',
-          label: '客户名称',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'serialNo',
-          label: '客户代号',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'productCode',
-          label: '产品编码',
-          align: 'center',
-          showOverflowTooltip: true,
-          minWidth: 140
-        },
-
-        {
-          prop: 'productName',
-          label: '产品名称',
-          align: 'center',
-          minWidth: 120
-        },
-
-        {
-          prop: 'model',
-          label: '型号',
-          align: 'center',
-          minWidth: 120
-        },
-
-        {
-          prop: 'brandNo',
-          label: '牌号',
-          align: 'center'
-        },
-
-        {
-          prop: 'deliveryTime',
-          label: '交付日期',
-          align: 'center',
-          showOverflowTooltip: true
-        },
-        {
-          prop: 'contractNum',
-          label: '合同数量',
-          align: 'center'
-        },
-        {
-          prop: 'lackNum',
-          label: '欠交数量',
-          align: 'center'
-        },
-
-
+    
+      {
+                    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
+                }
 
 
       ],
 
-      columns2: [
-        {
-          width: 50,
-          label: '序号',
-          prop: 'sort',
-          slot: 'sort',
-          align: 'center'
-        },
-
-        {
-          label: '物料名称',
-          prop: 'name',
-          align: 'center'
-        },
-
-        {
-          label: '物料编码',
-          prop: 'code',
-          align: 'center'
-        },
-        {
-          label: '牌号',
-          prop: 'brandNum',
-          align: 'center'
-        },
-        {
-          label: '型号',
-          prop: 'modelType',
-          align: 'center'
-        },
-
-        {
-          prop: 'inventoryQuantity',
-          label: '库存',
-          showOverflowTooltip: true,
-
-        },
-
-        {
-          prop: 'unit',
-          label: '计量单位',
-          showOverflowTooltip: true,
-          action: 'unit',
-        },
-
-        {
-          label: '需求数量',
-          prop: 'demandQuantity',
-          align: 'center',
-        },
-
-        {
-          label: '采购数量',
-          prop: 'purchaseQuantity',
-          align: 'center'
-        },
-
-        {
-          label: '到货方式',
-          slot: 'deliveryMethod',
-          action: 'deliveryMethod',
-          align: 'center'
-        },
-
-        {
-          label: '要求到货时间',
-          slot: 'requireDeliveryTime',
-          action: 'requireDeliveryTime',
-          align: 'center'
-        },
-
-
-
-        {
-          label: '图纸',
-          slot: 'imgUrl',
-          action: 'imgUrl',
-          align: 'center',
-        },
-
-
-        {
-          label: '附件',
-          slot: 'files',
-          action: ' files',
-          align: 'center',
-          minWidth: 140
-        },
-
-
-
-
-      ],
 
       rules: {},
 
@@ -301,12 +156,11 @@ export default {
     this.getDetailData(this.businessId);
   },
   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);

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

@@ -1,133 +0,0 @@
-<template>
-    <el-dialog :title="title" :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-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'"
-                            >
-                            <el-input placeholder="请输入" disabled 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 disabled v-model="row.requireDeliveryTime"  value-format="timestamp"   placeholder="请选择日期">
-                            </el-date-picker>
-                        </el-form-item>
-                    </template></el-table-column>
-
-
-
-
-            </el-table>
-
-        </el-form>
-
-
-
-
-        <div class="btns">
-            <el-button size="small" @click="handleClose">取消</el-button>
-        </div>
-    </el-dialog>
-</template>
-  
-<script>
-
-
-
-
-export default {
-    components: {
-    },
-    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'
-                }
-            }
-
-
-        }
-    },
-
-    watch: {
-
-    },
-    methods: {
-
-
-
-        open(row) {
-
-            this.form.timeList = row.timeList
-            this.current = row;
-            this.visible = true
-
-        },
-
-
-
-
-
-
-
-        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/todo/index.vue

@@ -234,6 +234,7 @@
       /** 处理审批按钮 */
 
       handleAudit(type, row) {
+      
         if (type == 'audit') {
           this.$refs.handleTaskRef.open({
             id: row.processInstance.id,