优化

src/views/outsourcing/components/details.vue

@@ -3,12 +3,19 @@
         :close-on-press-escape="false" append-to-body width="80%">
 
         <!-- 数据表格 -->
-        <ele-pro-table ref="table" :columns="columns" cache-key="detailsTable" height="calc(100vh - 350px)">
-
+        <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>
 
 
@@ -25,6 +32,7 @@ export default {
     data() {
         return {
             visible: false,
+            detailType: null,
 
         }
     },
@@ -91,6 +99,79 @@ export default {
 
 
 
+            ];
+        },
+
+        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'
+                },
+
+
             ];
         },
 
@@ -108,10 +189,17 @@ export default {
 
         open(row) {
             this.visible = true
-            this.$nextTick(() => {
-                this.$refs.table.setData([...row.detailList]);
-            })
-
+            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]);
+                })
+            }
 
 
 

src/views/outsourcing/components/release.vue

@@ -110,6 +110,7 @@ export default {
         save() {
             this.form.id = this.rowObj.id
             release(this.form).then(res => {
+                this.$emit('refresh')
                 this.close()
             })
         },

src/views/outsourcing/components/timeDialog.vue

@@ -34,7 +34,7 @@
                         </el-form-item>
                     </template></el-table-column>
 
-                <el-table-column label="操作" prop="action" width="80">
+                <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>

src/views/outsourcing/index.vue

@@ -7,14 +7,15 @@
             <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="workOrderTable">
 
 
-                
+
 
                 <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>
+                    <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 }">
@@ -44,17 +45,20 @@
 
 
                 <template v-slot:action="{ row }">
-                    <el-link type="primary" :underline="false" @click="handleFlow(row)">
-                        流程
-                    </el-link>
 
 
                     <el-link type="primary" :underline="false" @click="handleDetails(row)">
                         详情
                     </el-link>
 
+                    <el-link type="primary" v-if="row.status == 1" :underline="false" @click="handleFlow(row)">
+                        流程
+                    </el-link>
+
+
 
-                    <el-link type="primary"  v-if="row.status != 1" :underline="false" @click="handleRelease(row)">
+
+                    <el-link type="primary" v-if="row.status != 1" :underline="false" @click="handleRelease(row)">
                         发布
                     </el-link>
 
@@ -66,7 +70,7 @@
         </el-card>
         <flow ref="flowRef"></flow>
 
-        <release ref="releaseRef"></release>
+        <release ref="releaseRef" @refresh="releaseRefresh"></release>
         <detail ref="detailsRef"></detail>
 
         <timeDialog ref="timeDialogRef"></timeDialog>
@@ -247,10 +251,7 @@ export default {
         },
 
         handleDetails(row) {
-            if (this.clientEnvironmentId == 3) {
-                this.$refs.detailsRef.open(row)
-            }
-
+            this.$refs.detailsRef.open(row)
         },
 
         handleMethod(row) {
@@ -271,7 +272,13 @@ export default {
             this.$nextTick(() => {
                 this.$refs.table.reload({ page: 1, where });
             });
+        },
+
+        releaseRefresh() {
+            this.$refs.table.reload({ page: 1, where });
         }
+
+
     }
 };
 </script>

src/views/warehousing/components/tgDetails.vue

@@ -4,10 +4,6 @@
       :need-page="false">
 
 
-      
-
-
-
 
 
       <template v-slot:materielCode="{ row }">