Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/api/productionSchedulingPlan/scheduling.js

@@ -54,8 +54,9 @@ export const selectEquip = row => {
 // 排产恢复  recoveryUpdate
 export const recoveryUpdate = row => {
   return request({
-    url: '/blade-scheduling/workOrder/saveWorkOrderFromBak/' + row,
-    method: 'get',
+    url: '/blade-scheduling//yieldOrder/update',
+    method: 'post',
+    data: row,
     // data: row,
   });
 };

src/views/basicData/jobTransferManagement.vue

@@ -41,7 +41,7 @@
       </template>
       <template #menu="scope">
         <el-button type="text" @click="updateFun(scope.row)">修改</el-button>
-        <el-button v-show="scope.row.phStatus == 7" type="text" @click="transferToFun(scope.row)"
+        <el-button v-show="scope.row.phStatus == 6" type="text" @click="transferToFun(scope.row)"
           >转岗</el-button
         >
         <!-- v-show="scope.row.phStatus == 3" -->
@@ -259,7 +259,7 @@ export default {
         editBtnText: '修改',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 150,
+        menuWidth: 190,
         dialogWidth: 1200,
         dialogClickModal: false,
         searchEnter: true,

src/views/energyManagement/components/electricityQuota.vue

@@ -48,6 +48,7 @@ export default {
       data:[],
       isShowImport:false,
       selectionList: [],
+      query:{},
       option: {
         height: "auto",
         calcHeight: 32,
@@ -78,12 +79,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -160,6 +161,7 @@ export default {
             prop: "date",
             type:'date',
             search: true,
+            searchRange: true,
             sortable: true,
             filter: true,
             span: 24,
@@ -324,11 +326,17 @@ export default {
     },
     onLoad() {
       this.loading = true;
+      let param = {
+        ...this.query,
+        startDate:this.query.date && this.query.date.length != 0 && this.query.date[0],
+        endDate:this.query.date && this.query.date.length != 0 && this.query.date[1]
+      }
+      if(param.date) delete param.date
       pageList({
         current:this.page.currentPage,
         size:this.page.pageSize,
         type:2,
-        ...this.query
+        ...param
       }).then(res =>{
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/energyManagement/components/electricityTarget.vue

@@ -79,12 +79,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/components/waterQuota.vue

@@ -63,12 +63,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -152,6 +152,7 @@ export default {
             filter: true,
             span: 24,
             type: 'date',
+            searchRange: true,
             format: "YYYY-MM-DD",
             valueFormat: "YYYY-MM-DD",
             rules: [
@@ -370,11 +371,17 @@ export default {
     },
   onLoad() {
       this.loading = true;
+      let param = {
+        ...this.query,
+        startDate:this.query.date && this.query.date.length != 0 && this.query.date[0],
+        endDate:this.query.date && this.query.date.length != 0 && this.query.date[1]
+      }
+      if(param.date) delete param.date
       pageList({ 
         type: 1, 
         current:this.page.currentPage, 
         size:this.page.pageSize,
-        ...this.query
+        ...param
       }).then(res => {
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;

src/views/energyManagement/components/waterTarget.vue

@@ -85,12 +85,12 @@ export default {
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
         searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",
@@ -209,8 +209,11 @@ export default {
     },
 
     
-    closeDialog(){
+    closeDialog(val){
       this.isShowImport = false
+      if(val){
+        this.onLoad()
+      }
     },
     handleImport() {
       this.isShowImport = true

src/views/energyManagement/electricityManagement.vue

@@ -183,7 +183,7 @@ export default {
         delBtnIcon: ' ',
         addBtn: false,
         labelWidth: 120,
-        // searchLabelWidth: 120,
+        searchLabelWidth: "auto",
         menu: true,
         menuWidth: 100,
         dialogWidth: 600,

src/views/energyManagement/energyMonitoring.vue

@@ -102,7 +102,7 @@ export default {
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelWidth: "auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/peakFlatValley.vue

@@ -71,6 +71,7 @@ export default {
         index: false,
         showOverflowTooltip: true,
         searchLabelPosition: "left",
+        searchLabelWidth:"auto",
         searchGutter: 24,
         searchSpan: 6,
         menuAlign: "center",

src/views/energyManagement/waterManagement.vue

@@ -47,7 +47,7 @@ export default {
         delBtnIcon: " ",
         addBtn: false,
         labelWidth: 120,
-        // searchLabelWidth: 80,
+        searchLabelWidth: "auto",
         menu: false,
         menuWidth: 200,
         dialogWidth: 600,

src/views/flowManagement/milestoneDialog.vue

@@ -232,7 +232,7 @@
 </template>
 <script>
 import { getRoleUserList } from '@/api/processManagement/taskDispatch';
-import { projectExecute, projectCheck, projectApprove } from '@/api/flowManagement/index';
+import { projectExecute, projectCheck, projectApprove,getProcessDetail } from '@/api/flowManagement/index';
 import { getDictionary } from '@/api/system/dict';
 import jhSelect from '@/components/jh-select/index.vue';
 export default {
@@ -273,15 +273,39 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog;
-    this.executeForm = this.rowItem;
-    console.log(this.detailForm, 'title');
+    // this.executeForm = this.rowItem;
+    // console.log(this.detailForm, 'title');
     this.detailForm.checkResult = null;
     this.subTitle = this.title;
     console.log(this.rowItem, 'rowItem');
     this.getRoleUserList();
     this.getExecuteResult();
+    this.getDetails();
+
   },
   methods: {
+    // 获取详情数据
+    getDetails() {
+      getProcessDetail(this.rowItem.paId).then(res => {
+        this.$nextTick(() => {
+          // let data = res.data.data;
+          // Object.assign(this.addForm, data);
+
+          this.executeForm = res.data.data;
+          
+          // 安全地处理 memberName 回显
+          if (res.data.data.memberName) {
+            this.executeForm.memberName = String(res.data.data.memberName)
+              .split(',')
+              .map(id => id.trim())
+              .filter(Boolean);
+          } else {
+            this.executeForm.memberName = [];
+          }
+          this.$forceUpdate();
+        });
+      });
+    },
     executeTypeChange() {
       this.detailForm.delayTime = '';
     },

src/views/flowManagement/projectExecution.vue

@@ -21,19 +21,19 @@
         <el-button
           type="text"
           v-if="scope.row.approvalStatus == '3' && scope.row.checkResult == 0"
-          @click="executeRow(row, scope.row)"
+          @click="executeRow(scope.row, scope.row)"
           >执行</el-button
         >
         <el-button
           type="text"
           v-if="scope.row.checkResult == 1 || scope.row.checkResult == 3"
-          @click="auditRow(row, scope.row)"
+          @click="auditRow(scope.row, scope.row)"
           >核查</el-button
         >
         <el-button
           type="text"
           v-if="scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2"
-          @click="examineRow(row, scope.row)"
+          @click="examineRow(scope.row, scope.row)"
           >核准</el-button
         >
       </template>

src/views/productionSchedulingPlan/schedulingException/index.vue

@@ -310,7 +310,7 @@ export default {
       })
         .then(() => {
           this.loading = true;
-          return recoveryUpdate(row.id);
+          return recoveryUpdate({id:row.id,status:10003});
         })
         .then(() => {
           this.onLoad(this.page);

src/views/workLicense/workLicense.vue

@@ -164,7 +164,7 @@ export default {
             ],
           },
           {
-            label: '所属班组',
+            label: '部门',
             prop: 'deptName',
             span: 24,
             width: 150,

src/views/zhgd-work/dacangDispatch/index.vue

@@ -63,9 +63,11 @@ export default {
       };
       yieldOrderConfirm(query).then(res => {
         let data = res.data.data;
-        this.tableData = res.data.data
-        if(this.tableData.length<=0){
-          this.$message.error('订单分派失败，请到异常订单管理页面处理!')
+        this.tableData = res.data.data;
+        this.cardNo = '';
+        this.isAxios = true;
+        if (this.tableData.length <= 0) {
+          this.$message.error('订单分派失败，请到异常订单管理页面处理!');
         }
       });
       //   this.$ajax
@@ -75,8 +77,8 @@ export default {
       //         this.makeTeam = res.data;
       //         this.$message.success(this.$t('workbench.releaseSuccess'));
       //       }
-      //       this.cardNo = '';
-      //       this.isAxios = true;
+      // this.cardNo = '';
+      // this.isAxios = true;
       //     })
       //     .catch(() => {
       //       this.isAxios = true;