流程管理问题修改

src/api/equiptManagement/gradeLevel.js

@@ -0,0 +1,9 @@
+import request from '@/axios';
+
+export const getSuspensionNo = (data) => {
+    return request({
+      url: '/api/blade-desk/iot/getSuspensionNo',
+      method: 'post',
+      data
+    });
+};

src/api/flowManagement/projectExecution.js

@@ -0,0 +1,14 @@
+import request from '@/axios';
+
+// 获取列表
+export const getList = (current, size, params) => {
+    return request({
+        url: '/blade-desk/fmProjectMilestone/page',
+        method: 'get',
+        params: {
+            ...params,
+            current,
+            size,
+        },
+    });
+}

src/views/equiptManagement/gradeLevel/index.vue

@@ -0,0 +1,91 @@
+<template>
+  <basic-container>
+    <el-form ref="form" :model="form" :rules="rule" label-width="80px">
+      <el-row>
+        <el-col :span="8" :offset="6">
+          <el-form-item label="设备：" prop="deviceCode">
+            <!-- <el-input v-model="form.deviceCode"></el-input> -->
+            <jhSelect
+              :value="form.deviceCode"
+              @input="val => (form.deviceCode = val)"
+              placeholder="请搜索选择"
+              api-url="/blade-desk/equipment/page"
+              api-method="get"
+              list-key="records"
+              total-key="total"
+              label-key="deviceCode"
+              value-key="deviceCode"
+              search-key="deviceCode"
+              :debounce-time="500"
+              @change="changeTeacher"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" :offset="6">
+          <el-form-item label="挂次号：" prop="callNumber">
+            <el-input v-model="form.callNumber" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="6" :offset="6">
+          <el-form-item>
+            <el-button type="primary" @click="onSubmit" :loading="levelLoading">推送</el-button>
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </el-form>
+  </basic-container>
+</template>
+<script>
+import jhSelect from '@/components/jh-select/index.vue';
+import { getSuspensionNo } from '@/api/equiptManagement/gradeLevel';
+export default {
+  name: 'wc-extend',
+  components: { jhSelect },
+  data() {
+    return {
+      form: {
+        deviceCode: '', //设备编码
+        callNumber: '', //挂此号
+      },
+      rule:{
+        deviceCode: [
+          {
+            required: true,
+            message: '请选择设备编码',
+            trigger: 'blur',
+          },
+        ],
+        callNumber: [
+          {
+            required: true,
+            message: '请输入挂此号',
+            trigger: 'blur',
+          },
+        ],
+      },
+      levelLoading: false,
+    };
+  },
+  methods: {
+    onSubmit() {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.levelLoading = true;
+          getSuspensionNo({ ...this.form }).then(res=>{
+            this.levelLoading = false
+            this.form.callNumber = ''
+            this.form.deviceCode = ''
+            this.$message.success('操作成功');
+          }).catch(err=>{
+             this.levelLoading = false
+            this.form.callNumber = ''
+            this.form.deviceCode = ''
+          })
+        }
+      });
+    },
+  },
+};
+</script>

src/views/flowManagement/managementOfKeyTasks.vue

@@ -38,7 +38,7 @@
         {{ scope.row.projectDesiredEnd ? scope.row.projectDesiredEnd.substring(0, 10) : '' }}
       </template>
       <!-- 列表嵌套表格 -->
-      <template #expand="{ row }">
+      <!-- <template #expand="{ row }">
         <el-table :data="row.stoneList" size="small" style="padding: 5px">
           <el-table-column label="里程碑计划" align="center" prop="milestonePlan"></el-table-column>
           <el-table-column
@@ -105,7 +105,7 @@
             </template>
           </el-table-column>
         </el-table>
-      </template>
+      </template> -->
     </avue-crud>
     <!-- 新增弹窗 -->
     <add-dialog
@@ -180,7 +180,7 @@ export default {
       option: {
         columnSort: true,
         tip: false,
-        expand: true,
+        expand: false,
         rowKey: 'id',
         height: 'auto',
         align: 'center',
@@ -238,7 +238,7 @@ export default {
             label: '项目负责人',
             prop: 'projectHead',
             overflow: true,
-            search: true,
+            search: false,
             searchLabelWidth: 100,
             width: 100,
           },

src/views/flowManagement/projectExecution.vue

@@ -16,8 +16,26 @@
       @on-load="onLoad"
     >
       <template #menu-left> </template>
-      <template #menu="{ row }">
+      <template #menu="scope">
-        <el-button type="text" @click="handleView(row)">详情</el-button>
+        <el-button type="text" @click="handleView(scope.row)">详情</el-button>
+        <el-button
+          type="text"
+          v-if="scope.row.approvalStatus == '3' && scope.row.checkResult == 0"
+          @click="executeRow(row, scope.row)"
+          >执行</el-button
+        >
+        <el-button
+          type="text"
+          v-if="scope.row.checkResult == 1 || scope.row.checkResult == 3"
+          @click="auditRow(row, scope.row)"
+          >核查</el-button
+        >
+        <el-button
+          type="text"
+          v-if="scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2"
+          @click="examineRow(row, scope.row)"
+          >核准</el-button
+        >
       </template>
       <!-- 项目开始时间 -->
       <template #projectStartTime="scope">
@@ -29,6 +47,20 @@
       <template #milestoneNode="scope">
         {{ scope.row.milestoneNode ? scope.row.milestoneNode.substring(0, 10) : '' }}
       </template>
+      <template #gradeMan="scope">
+          <span v-if="scope.row.gradeTitle == '优'||scope.row.gradeTitle=='良'||scope.row.gradeTitle=='中'">{{ scope.row.gradeMan }}</span>
+      </template>
+      <template #checkResultTitle="scope">
+        <span
+          v-if="
+            scope.row.checkResult == 1 ||
+            scope.row.checkResult == 3 ||
+            (scope.row.gradeTitle == '待评价' && scope.row.checkResult == 2)
+          "
+          >{{ scope.row.checkResultTitle }}</span
+        >
+        <span v-else></span>
+      </template>
       <!-- <template #executeType="scope">
         {{ scope.row.executeTypeText }}
       </template> -->
@@ -56,6 +88,7 @@
 
 <script>
 import { getProcessList, updateProcess, delProcess } from '../../api/flowManagement/index';
+import { getList } from '@/api/flowManagement/projectExecution';
 import AddDialog from './addDialog.vue';
 import review from './review.vue';
 import milestoneDialog from './milestoneDialog.vue';
@@ -137,20 +170,20 @@ export default {
             prop: 'paCode',
             overflow: true,
             search: true,
-            width:140,
+            width: 140,
           },
           {
             label: '项目名称',
             prop: 'projectName',
             overflow: true,
             search: true,
-            width:140,
+            width: 140,
           },
           {
             label: '项目负责人',
             prop: 'projectHead',
             overflow: true,
-            search: true,
+            search: false,
             width: 140,
           },
           {
@@ -164,14 +197,14 @@ export default {
             label: '里程碑负责人',
             prop: 'milestoneMan',
             overflow: true,
-            search: true,
+            search: false,
             width: 140,
           },
           {
             label: '里程碑输出物',
             prop: 'outputMaterial',
             overflow: true,
-            search: true,
+            search: false,
             width: 190,
           },
           {
@@ -200,7 +233,7 @@ export default {
             label: '执行类型',
             prop: 'executeTypeText',
             overflow: true,
-            search: false,
+            search: true,
             width: 140,
           },
           {
@@ -214,7 +247,7 @@ export default {
             label: '核查结果',
             prop: 'checkResultTitle',
             overflow: true,
-            search: false,
+            search: true,
             width: 140,
           },
           {
@@ -228,7 +261,7 @@ export default {
             label: '评价等级',
             prop: 'gradeTitle',
             overflow: true,
-            search: false,
+            search: true,
             width: 140,
           },
           {
@@ -293,6 +326,7 @@ export default {
     // 查看详情
     handleView(row) {
       this.title = '详情';
+      row.id=row.paId
       this.rowItem = row;
       this.addDialogVisible = true;
     },
@@ -398,22 +432,12 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getProcessList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
+      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-        res => {
         const records = res.data.data.records;
-          this.data = records.map(item => {
+        this.data = records;
-            if (item.stoneList && Array.isArray(item.stoneList)) {
-              item.stoneList = item.stoneList.map(stone => ({
-                ...stone,
-                executeTypeText: this.getExecuteTypeText(stone.executeType),
-              }));
-            }
-            return item;
-          });
         this.loading = false;
         this.page.total = res.data.data.total;
-        }
+      });
-      );
     },
   },
 };