优化

src/api/technology/version/version.js

@@ -73,11 +73,3 @@ export async function syncVersion(data) {
   return Promise.reject(new Error(res.data.message));
 }
 
-// 根据工艺路线编码获取历史版本
-export async function getHistoryByCode(id) {
-  const res = await request.get(`/main/producerouting/getHistoryByCode/${id}`);
-  if (res.data.code == 0) {
-    return res.data.data;
-  }
-  return Promise.reject(new Error(res.data.message));
-}

src/views/technology/route/components/historyModal.vue

@@ -1,22 +1,48 @@
 <template>
     <el-dialog title="历史版本" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
         :close-on-press-escape="false" append-to-body width="60%">
- 
-                    <ele-pro-table ref="table" :columns="columns" :datasource="datasource" height="calc(100vh - 350px)"
-                        class="dict-table">
-                        <!-- 表头工具栏 -->
-                        <template v-slot:action="{ row }">
-                            <el-radio class="radio" v-model="radio" :label="row.id"><i></i></el-radio>
-                        </template>
-                    </ele-pro-table>
- 
- 
+
+        <el-col :span="8">
+            <el-form-item label="工艺路线编码：">
+                <span> {{ form.code }} </span>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label="工艺路线名称：">
+                <span> {{ form.name }} </span>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label="产品编码：">
+                <span> {{ form.categoryCode }} </span>
+            </el-form-item>
+        </el-col>
+        <el-col :span="8">
+            <el-form-item label="产品名称：">
+                <span> {{ form.categoryName }} </span>
+            </el-form-item>
+        </el-col>
+
+
+
+        <ele-pro-table ref="table" :columns="columns" :datasource="datasource" height="calc(100vh - 350px)"
+            class="dict-table">
+            <!-- 表头工具栏 -->
+
+            <!-- 状态列 -->
+            <template v-slot:status="{ row }">
+                {{ checkStatus(row) }}
+            </template>
+
+        </ele-pro-table>
+
+
     </el-dialog>
 </template>
   
 <script>
 import AssetTree from '@/components/AssetTree';
-import { getHistoryByCode } from '@/api/technology/version/version.js';
+import route from '@/api/technology/route';
 export default {
     components: { AssetTree },
     data() {
@@ -32,34 +58,63 @@ export default {
                     reserveSelection: true
                 },
                 {
-                    prop: 'code',
-                    label: '产品编码'
-                },
-                {
-                    prop: 'name',
-                    label: '产品名称',
-                    showOverflowTooltip: true
+                    prop: 'version',
+                    label: '版本',
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    minWidth: 110
                 },
                 {
-                    prop: 'brandNum',
-                    label: '牌号'
+                    prop: 'status',
+                    label: '状态',
+                    align: 'center',
+                    slot: 'status',
+                    showOverflowTooltip: true,
+                    minWidth: 110
                 },
+
                 {
-                    prop: 'modelType',
-                    label: '型号'
+                    prop: 'createTime',
+                    label: '创建日期',
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    minWidth: 110
                 },
+
                 {
-                    prop: 'measuringUnit',
-                    label: '计量单位'
+                    prop: 'releaseTime',
+                    label: '发布日期',
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    minWidth: 110
                 },
+
+
                 {
-                    prop: 'packingUnit',
-                    label: '包装单位'
+                    prop: 'downTime',
+                    label: '停用时间',
+                    align: 'center',
+                    showOverflowTooltip: true,
+                    minWidth: 110
                 },
-             
+
+
+
+
+
+
+
+
+
+            ],
+
+            statusList: [
+                { label: '草稿', value: -1 },
+                { label: '失效', value: 0 },
+                { label: '生效', value: 1 }
             ],
-         
             form: null
+
         }
     },
 
@@ -68,15 +123,20 @@ export default {
     },
     methods: {
         /* 表格数据源 */
-        datasource({ page, where, limit }) {
-            return getHistoryByCode(this.form.id);
+        async datasource({ page, limit }) {
+            const res = await route.list({
+                code: this.form.code,
+
+                pageNum: page,
+                size: limit
+            });
+            return res;
         },
 
 
         open(item) {
             if (item) {
-             this.form = item
-             console.log( this.form )
+                this.form = item
             }
             this.visible = true
         },
@@ -84,8 +144,13 @@ export default {
 
         handleClose() {
             this.visible = false
-            this.current = null
-            this.radio = ''
+            this.form = null
+
+        },
+
+        checkStatus(row) {
+            let obj = this.statusList.find((it) => it.value == row.status);
+            return obj.label;
         },
 
     }

src/views/technology/route/components/user-search.vue

@@ -65,7 +65,7 @@
       const defaultWhere = {
         code: '',
         name: '',
-        status: -1
+        status: 1
       };
       return {
         // 表单数据

src/views/workforceManagement/schedule/components/ManagementTable.vue

@@ -37,7 +37,7 @@
           </el-col>
           <el-col :span="16">
             <el-form-item class="btn-wrap" style="margin-bottom: 0">
-              <el-button @click="save">保存</el-button>
+              <el-button @click="save" >保存</el-button>
               <el-button @click="rest">重置</el-button>
               <el-button @click="anbp">{{
                 type == 'person' ? '按班排' : '按人排'

src/views/workforceManagement/schedule/detail.vue

@@ -222,10 +222,13 @@ export default {
         personDetails,
         teamDetails
       };
+      const loading = this.$messageLoading('正在请求中..');
       teamqueuedetailupdate(par).then((msg) => {
         this.$message.success(msg);
         this.rest();
-      });
+      }).finally(() => {
+        loading.close();
+      })
     },
     // 处理新增信息
     setAddinfo() {
@@ -305,7 +308,8 @@ export default {
         teamDetails.push({
           type: n.item.type,
           teamId: n.item.teamId,
-          teamQueueTime
+          
+
         });
       });
       let par = {
@@ -314,10 +318,13 @@ export default {
         personDetails,
         teamDetails
       };
+      const loading = this.$messageLoading('正在请求中..');
       teamqueuedetailSave(par).then((msg) => {
         this.$message.success(msg);
         finishPageTab();
-      });
+      }).finally(() => {
+        loading.close();
+      })
     },
     // 重置
     rest() {