From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

---
 src/views/plan/productionschedul/index.vue |   97 ++++++++++++++++++++++++++++++------------------
 1 files changed, 60 insertions(+), 37 deletions(-)

diff --git a/src/views/plan/productionschedul/index.vue b/src/views/plan/productionschedul/index.vue
index 98e9d55..ea426fd 100644
--- a/src/views/plan/productionschedul/index.vue
+++ b/src/views/plan/productionschedul/index.vue
@@ -10,6 +10,8 @@
         :ajaxFun="ajaxFun"
         :paramObj="queryParams"
         :mergeSpanArr="spanArr"
+        :selColValArr="paramSelArr"
+        :selCol="paramSelCol"
         ref="ttable">
         <template #toolbar>
             <el-dropdown @command="changeTable">
@@ -134,12 +136,27 @@
             </div>
         </el-card>
     </el-dialog>
+    <!-- 鏌ョ湅鍙樻洿璁板綍 -->
+    <el-dialog
+    title="鍙樻洿璁板綍"
+    :visible.sync="showRecordsDialog"
+    width="60%">
+        <el-table border :data="recordsList">
+            <el-table-column type="index" width="50" label="搴忓彿" align="center"/>
+            <el-table-column prop="createTime" min-width="120" show-overflow-tooltip label="鎿嶄綔鏃堕棿" align="center"/>
+            <el-table-column prop="createUser" min-width="120" show-overflow-tooltip label="鎿嶄綔浜�" align="center"/>
+            <el-table-column prop="recordType" min-width="120" show-overflow-tooltip label="鎿嶄綔绫诲瀷" align="center"/>
+            <el-table-column prop="oldRecord" min-width="200" show-overflow-tooltip label="鏃у��" align="center"/>
+            <el-table-column prop="newRecord" min-width="200" show-overflow-tooltip label="鏂板��" align="center"/>
+        </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import {
   fetchScheduleList,
+  fetchRecordsList,
   fetchScheduleById,
   fillTime,
   deleteSchedul,
@@ -149,13 +166,16 @@
 } from '@/api//plan/productionschedul'
 import ttable from '@/views/common/ztt-table.vue'
 import { mapGetters } from 'vuex'
-import { remote } from '@/api/admin/dict'
 export default {
     data() {
     return {
       queryParams: {
         state: false
       },
+      showRecordsDialog: false,
+      recordsList: [],
+      paramSelArr: [false],
+      paramSelCol: 'hasEdit',
       ajaxFun: fetchScheduleList,
       prelang: 'productSchedul',
       options: {
@@ -170,7 +190,7 @@
         isRefresh: true, // 鏄惁鏄剧ず鍒锋柊鎸夐挳
         isShowHide: true, // 鏄惁鏄剧ず鏄惧奖鎸夐挳H
         isSearch: true, // 楂樼骇鏌ヨ鎸夐挳
-        defaultOrderBy: { column: 'createdTime', direction: 'desc' },
+        defaultOrderBy: { column: 'id', direction: 'asc' },
         cancelRunCreated: false,
         tableCellMerge: true
       },
@@ -332,8 +352,8 @@
         operatorConfig: {
             fixed: 'right',
             label: '鎿嶄綔',
-            width: 100,
-            minWidth: 100
+            width: 150,
+            minWidth: 150
         }
       },
       dropdownTitleStyle: {
@@ -384,47 +404,51 @@
     }
   },
   methods: {
-    getProductionSchedulStaffDict(){
-        const _than = this
-        remote('productionschedul_staff').then((response) => {
-            if (response.status === 200) {
-                response.data.data.map((ele)=>{
-                    _than.productionSchedulStaffOptions.push(ele.value)
-                })
-            } else {
-                _than.productionSchedulStaffOptions = []
-            }
-        })
+    showChangeRecords(row){
+        this.recordsList = []
+        if(row){
+            fetchRecordsList(row.mid).then((res)=>{
+                if(res.status===200){
+                    this.recordsList = res.data.data.records
+                }
+            }).catch((error)=>{
+                console.error(error);
+            })
+        }
+        this.showRecordsDialog = true
     },
     showOperator(){
+        this.table.operator = [{
+            text: '鍙樻洿璁板綍',
+            type: 'text',
+            size: 'small',
+            fun: this.showChangeRecords,
+        }]
         if(this.showUnDownTable){
             if(this.permissions.plan_productionschedul_edit){
-                this.table.operator = [{
+                this.table.operator.push({
                     text: '缂栬緫',
                     type: 'text',
                     size: 'small',
-                    fun: this.editHandle
-                }]
+                    fun: this.editHandle,
+                    show: {
+                        key: 'hasEdit',
+                        val: [true]
+                    }
+                })
             }
             if(this.permissions.plan_productionschedul_del){
-                if(this.table.operator == null){
-                    this.table.operator = [{
-                        text: '鍒犻櫎',
-                        type: 'text',
-                        size: 'small',
-                        fun: this.deleteHandle
-                    }]
-                }else{
-                    this.table.operator.push({
-                        text: '鍒犻櫎',
-                        type: 'text',
-                        size: 'small',
-                        fun: this.deleteHandle
-                    })
-                }
+                this.table.operator.push({
+                    text: '鍒犻櫎',
+                    type: 'text',
+                    size: 'small',
+                    fun: this.deleteHandle,
+                    show: {
+                        key: 'hasEdit',
+                        val: [true]
+                    }
+                })
             }
-        }else{
-            this.table.operator = null
         }
     },
     handleClickCell(row){
@@ -462,8 +486,7 @@
       updateState(ids).then(res=>{
         if(res.status===200){
           this.$message.success("鏇存柊鎴愬姛")
-          this.getUnFinishedData()
-          this.getFinishedData()
+          this.getDataList()
         }
       }).catch(error=>{
         console.error(error);

--
Gitblit v1.9.3