“过程监测”改“过程控制”

src/api/recordRules/index.js

@@ -27,7 +27,7 @@ export async function recordrulesPage(body) {
   return Promise.reject(new Error(res.data.message));
 }
 
-// 规则记录分页查询 过程监测 /main/recordrules/notProduceTaskConfigRecordRulesPage
+// 规则记录分页查询 过程控制 /main/recordrules/notProduceTaskConfigRecordRulesPage
 export async function recordrulesNotProduceTaskConfigRecordRulesPage(body) {
   const res = await request.post(
     `/main/recordrules/processInspectionRecordRulesPage`,

src/components/selectReleaseRules/select-release-rules.vue

@@ -50,7 +50,7 @@
     components: { search },
     mixins: [tabMixins, dictMixins],
     props: {
-      // NotProduceTaskConfig bool 是否排除已配置的记录规则 过程监测传true
+      // NotProduceTaskConfig bool 是否排除已配置的记录规则 过程控制传true
       notProduceTaskConfig: {
         type: Boolean,
         default: false

src/views/batchRecord/components/editModal.vue

@@ -786,7 +786,7 @@
       selectPlanRules
     },
     props: {
-      // 1-产前准备，2-过程监测，3-产后检查 4-生产统计
+      // 1-产前准备，2-过程控制，3-产后检查 4-生产统计
       reportWorkType: {
         type: Number,
         default: 1
@@ -1065,7 +1065,7 @@
           case 1:
             return '产前准备';
           case 2:
-            return '过程监测';
+            return '过程控制';
           case 3:
             return '产后检查';
           case 4:

src/views/batchRecord/components/list.vue

@@ -191,7 +191,7 @@
     name: 'batchRecordTable',
     mixins: [dictMixins, tableColumnsMixin],
     props: {
-      // 1-产前准备，2-过程监测，3-产后检查
+      // 1-产前准备，2-过程控制，3-产后检查
       reportWorkType: {
         type: Number,
         default: 1
@@ -439,7 +439,7 @@
         if (this.reportWorkType == 1) {
           businessType = '产前准备';
         } else if (this.reportWorkType == 2) {
-          businessType = '过程监测';
+          businessType = '过程控制';
         } else if (this.reportWorkType == 3) {
           businessType = '产后检查';
         } else {

src/views/produce/components/footBtn.vue

@@ -54,7 +54,7 @@
             isShow: 'mes:feed:save'
           },
           {
-            name: '过程监测',
+            name: '过程控制',
             type: 'processDetection',
             bjColor: '#008888',
             isShow: 'mes:producetaskrulerecord:save2'
@@ -267,16 +267,16 @@
         btnList: [],
         disableObj: {
           preResult: {
-            buts: ['投料', '过程监测', '产后检查', '报工'],
+            buts: ['投料', '过程控制', '产后检查', '报工'],
             msg: '请先完成产前准备'
           },
           feedResult: {
-            buts: ['过程监测', '产后检查', '报工'],
+            buts: ['过程控制', '产后检查', '报工'],
             msg: '请先完成投料'
           },
           postResult: {
             buts: ['产后检查', '报工'],
-            msg: '请先完成过程监测'
+            msg: '请先完成过程控制'
           },
           finalResult: {
             buts: ['报工'],

src/views/produce/components/prenatalExamination/components/workOrder/details.vue

@@ -6,43 +6,51 @@
           <HeaderTitle title="基本信息" size="16px"> </HeaderTitle>
           <el-row>
             <el-col :span="24">
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="计划单号">
                   <span> {{ infoData.planCode }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="来源计划配置单号">
                   <span> {{ infoData.planConfigCode }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="名称">
                   <span> {{ infoData.planName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="部门">
-                  <span>
-                    {{ infoData.executeGroupName }}
+              <el-col :span="8">
+                <el-form-item label="指定执行人">
+                  <span v-if="infoData.assignUser">
+                    {{
+                      infoData.assignUser
+                        .map((i) => {
+                          return `${i.groupName}-${i.userName}`;
+                        })
+                        .join(',')
+                    }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
-                <el-form-item label="人员">
-                  <span>
-                    {{ infoData.executeUserName }}
+              <el-col :span="8">
+                <el-form-item label="实际执行人">
+                  <span v-if="infoData.executeUserName">
+                    {{ infoData.executeGroupName }}-{{
+                      infoData.executeUserName
+                    }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="计划完成时长">
                   <span v-if="infoData.duration >= 0"
                     >{{ infoData.duration }}分钟</span
                   >
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="周期">
                   <span v-if="infoData.ruleInfo">
                     {{ infoData.ruleInfo.cycleValue
@@ -52,40 +60,55 @@
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="设备分类">
                   <span> {{ infoData.categoryLevelName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="规则名称">
                   <span>
                     {{ infoData.ruleName }}
                   </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建部门">
                   <span> {{ infoData.createGroupName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建人">
                   <span> {{ infoData.createUserName }} </span>
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="8">
                 <el-form-item label="创建时间">
                   <span> {{ infoData.createTime }} </span>
                 </el-form-item>
               </el-col>
+              <el-col :span="8">
+                <el-form-item label="实际开始时间">
+                  <span> {{ infoData.acceptTime }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="实际完成时间">
+                  <span> {{ infoData.finishTime }} </span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item label="报工时间">
+                  <span> {{ infoData.reportTime }} </span>
+                </el-form-item>
+              </el-col>
               <el-col :span="24">
                 <el-form-item label="备注">
                   <span> {{ infoData.remark }} </span>
                 </el-form-item>
               </el-col>
             </el-col>
-            <!-- <el-col :span="12">
+            <!-- <el-col :span="8">
               <img :src="data.imageUrl" alt="" />
             </el-col> -->
           </el-row>

src/views/produce/components/prenatalExamination/index.vue

@@ -75,7 +75,7 @@
         workOrderInfo: null,
         // 工序信息
         produceTaskInfo: null,
-        // 	报工类型，参考字典项：record_rules_report_work_type，1-产前准备，2-过程监测，3-产后检查
+        // 	报工类型，参考字典项：record_rules_report_work_type，1-产前准备，2-过程控制，3-产后检查
         reportWorkType: 1,
         butLoad: false,
         // 记录规则

src/views/produce/index.vue

@@ -344,7 +344,7 @@
     <!-- BOM详情 -->
     <BomDetailsPop ref="bomDrawer"></BomDetailsPop>
 
-    <!-- 产前准备 、 过程监测 、产后检测 -->
+    <!-- 产前准备 、 过程控制 、产后检测 -->
     <prenatalExamination
       ref="prenatalExaminationRef"
       @close="closePrenatalExamination"
@@ -1050,7 +1050,7 @@
           }
         }
 
-        // 产前准备 过程监测 产后检查
+        // 产前准备 过程控制 产后检查
         if (
           t == 'prenatalExamination' ||
           t == 'processDetection' ||
@@ -1061,7 +1061,7 @@
               return this.$message.warning('产前准备只能选择一个工单！');
             }
             if (t == 'processDetection') {
-              return this.$message.warning('过程监测只能选择一个工单！');
+              return this.$message.warning('过程控制只能选择一个工单！');
             }
             return this.$message.warning('产后检查只能选择一个工单！');
           }
@@ -1091,7 +1091,7 @@
           this.$refs.prenatalExaminationRef.open(
             this.workData.list[0],
             this.produceTaskInfo,
-            // 	报工类型，参考字典项：record_rules_report_work_type，1-产前准备，2-过程监测，3-产后检查
+            // 	报工类型，参考字典项：record_rules_report_work_type，1-产前准备，2-过程控制，3-产后检查
             reportWorkType
           );
         }

src/views/produceOrder/components/recordRules/recordRules.vue

@@ -142,7 +142,7 @@
         reportWorkType: 1,
         reportWorkTypeOptions: [
           { label: '产前准备', value: 1 },
-          { label: '过程监测', value: 2 },
+          { label: '过程控制', value: 2 },
           { label: '产后检查', value: 3 }
         ],
         dialogTitle: ''