Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dengfei

src/api/recordrules/index.js

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

src/components/addDoc/api/index.js

@@ -98,6 +98,14 @@ export async function getCode(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 已使用已申请编码
+export async function businesscodeapplyPage(data) {
+  const res = await request.post(`/main/businesscodeapply/page`,data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 /**
  * 上传文件

src/components/addDoc/getCode.vue

@@ -1,7 +1,7 @@
 <!-- 用户编辑弹窗 -->
 <template>
   <ele-modal
-    width="500px"
+    width="1000px"
     :visible.sync="showEditFlag"
     :close-on-click-modal="false"
     custom-class="ele-dialog-form"
@@ -11,73 +11,110 @@
   >
     <el-form ref="form" :model="form" :rules="rules" label-width="82px">
       <el-row :gutter="15">
-        <el-col :span="24">
-          <el-form-item label="编码分类" prop="type">
-            <ele-tree-select
-              clearable
-              :data="list"
-              v-model="form.type"
-              placeholder="请选择"
-              default-expand-all
-              labelKey="name"
-              childrenKey="sonDirectoryList"
-              valueKey="id"
-              @change="typeChange"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="编码方案" prop="type1">
-            <el-select
-              v-model="form.type1"
-              placeholder="请选择"
-              style="width: 100%"
-              @change="type1Change"
-            >
-              <el-option
-                v-for="item in options"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="编码预览" prop="code">
-            <el-input v-model="form.code" disabled></el-input>
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="24">
-          <headerTitle title="编码码段"></headerTitle>
-          <template v-for="item in segmentList">
-            <el-form-item :label="item.name" :prop="item.id" :key="item.id">
-              <el-input
-                v-if="item.roughRule == 5 || item.roughRule == 4"
-                :disabled="true"
-                v-model="item.currentValue"
-              ></el-input>
-              <el-select
-                v-else
-                v-model="item.currentValue"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="(segmentValue, index) in item.value"
-                  :key="index"
-                  :label="segmentValue.value"
-                  :value="segmentValue.value"
-                  @click.native="
-                    segmentValueChange(item.id, segmentValue.value, index)
-                  "
+        <el-col :span="12">
+          <el-row :gutter="15">
+            <el-col :span="24">
+              <el-form-item label="编码分类" prop="type">
+                <ele-tree-select
+                  clearable
+                  :data="list"
+                  v-model="form.type"
+                  placeholder="请选择"
+                  default-expand-all
+                  labelKey="name"
+                  childrenKey="sonDirectoryList"
+                  valueKey="id"
+                  @change="typeChange"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="编码方案" prop="type1">
+                <el-select
+                  v-model="form.type1"
+                  placeholder="请选择"
+                  style="width: 100%"
+                  @change="type1Change"
                 >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </template>
+                  <el-option
+                    v-for="item in options"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="编码预览" prop="code">
+                <el-input v-model="form.code" disabled></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+              <headerTitle title="编码码段"></headerTitle>
+              <template v-for="item in segmentList">
+                <el-form-item :label="item.name" :prop="item.id" :key="item.id">
+                  <el-input
+                    v-if="item.roughRule == 5 || item.roughRule == 4"
+                    :disabled="true"
+                    v-model="item.currentValue"
+                  ></el-input>
+                  <el-select
+                    v-else
+                    v-model="item.currentValue"
+                    placeholder="请选择"
+                    style="width: 100%"
+                  >
+                    <el-option
+                      v-for="(segmentValue, index) in item.value"
+                      :key="index"
+                      :label="segmentValue.value"
+                      :value="segmentValue.value"
+                      @click.native="
+                        segmentValueChange(item.id, segmentValue.value, index)
+                      "
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </template>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="12">
+          <ele-pro-table
+            ref="table"
+            :initLoad="false"
+            :columns="[
+              {
+                prop: 'businessCode',
+                label: '已申请编码',
+                align: 'center'
+              }
+            ]"
+            :datasource="datasource"
+            height="300px"
+            full-height="calc(100vh - 116px)"
+            @cell-dblclick="handleDblclick"
+            :page-size="10"
+          ></ele-pro-table>
+          <ele-pro-table
+            ref="table1"
+            :initLoad="false"
+            :columns="[
+              {
+                prop: 'businessCode',
+                label: '已使用编码',
+                align: 'center'
+              }
+            ]"
+            :datasource="datasource1"
+            height="300px"
+            full-height="calc(100vh - 116px)"
+            :page-size="10"
+          ></ele-pro-table>
         </el-col>
       </el-row>
     </el-form>
@@ -94,7 +131,8 @@
     selectTreeList,
     listParentId,
     pageSegment,
-    getCode
+    getCode,
+    businesscodeapplyPage
   } from './api/index.js';
   import headerTitle from '@/components/header-title/index.vue';
 
@@ -170,13 +208,14 @@
           item['currentValue'] = codeData.values[index];
           return item;
         });
+        this.$nextTick(() => {
+          this.$refs.table.reload({where:{}});
+          this.$refs.table1.reload({where:{}});
+        });
       },
       async segmentValueChange() {
-        // codeManageId:id,
-        //   code:value,
         let codeData = await getCode({
           categoryId: this.form.type1,
-
           codeManageArray: this.segmentList.map((item) => {
             return {
               codeManageId: item.id,
@@ -186,13 +225,47 @@
           isUpdateNo: 1
         });
         this.form.code = codeData.codeStr;
+             this.$nextTick(() => {
+          this.$refs.table.reload({where:{}});
+          this.$refs.table1.reload({where:{}});
+        });
+      },
+      /* 表格数据源 */
+      datasource({ page, limit, where }) {
+        if (where.isCancle) {
+          return [];
+        }
+        return businesscodeapplyPage({
+          pageNum: page,
+          size: limit,
+          status: 0,
+          buninessCategoryId: this.form.type1,
+          ...where
+        });
+      },
+      /* 表格数据源 */
+      datasource1({ page, limit, where }) {
+        console.log(where,'dsdsd')
+        if (where.isCancle) {
+          return [];
+        }
+        return businesscodeapplyPage({
+          pageNum: page,
+          buninessCategoryId: this.form.type1,
+          size: limit,
+          status: 1,
+          ...where
+        });
       },
       /* 保存编辑 */
       save() {
         this.$emit('setCode', this.form.code);
         this.cancel();
       },
-
+      handleDblclick(row) {
+        this.$emit('setCode', row.businessCode);
+        this.cancel();
+      },
       cancel() {
         this.form.type = '';
         this.form.code = '';
@@ -200,6 +273,10 @@
         this.showEditFlag = false;
         this.segmentList = [];
         this.options = [];
+        this.$nextTick(() => {
+          this.$refs.table.reload({ where: { isCancle: true } });
+          this.$refs.table1.reload({ where: { isCancle: true } });
+        });
       }
     }
   };

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/material/BOMmanage/components/workingProcedure.vue

@@ -788,7 +788,7 @@
             </template>
           </ele-pro-table>
         </el-tab-pane>
-        <el-tab-pane label="过程监测" name="过程监测">
+        <el-tab-pane label="过程控制" name="过程控制">
           <userSettingMatterProcess
             :produce-task-id="rowData.sourceTaskId"
             :produce-task-name="rowData.name"
@@ -1653,8 +1653,8 @@
           this.$refs.deviceTabRef.setData(
             this.tableData.taskParam[this.currentIndex].standardDevice || []
           );
-        } else if (this.activeName === '过程监测') {
-          // 过程监测数据查询
+        } else if (this.activeName === '过程控制') {
+          // 过程控制数据查询
         }
       },
       openParam(type) {
@@ -1894,7 +1894,7 @@
               });
               console.log('111112223344', this.tableData.taskParam);
 
-              // 保存过程监测事项
+              // 保存过程控制事项
               this.$refs.userSettingMatterProcessRef?.saveMatterList();
 
               workingProcedureUpdate({

src/views/productionScheduling/productionLineBeat/components/addOrEditDialog.vue

@@ -175,7 +175,11 @@
     factoriesName: '', //工厂名称
     list: [] //表格数据
   };
-  import { getFactoryarea } from '@/api/factoryModel';
+  import {
+    getFactoryarea,
+    listFactoryLineByFactoryId
+  } from '@/api/factoryModel';
+
   import ProductModal from '@/components/productList/product-list.vue';
   import {
     saveOrUpdate,
@@ -297,15 +301,12 @@
         });
         this.factoryList = list || [];
       },
+      /* 获取产线 */
+
       async change_factoryId(item) {
-        const { list } = await getFactoryarea({
-          pageNum: 1,
-          size: 999,
-          type: 4,
-          factoryId: item.id,
-          enable: 1
-        });
-        this.productionLineList = list || [];
+        this.productionLineList = await listFactoryLineByFactoryId([
+          this.form.factoriesId
+        ]);
         this.form.factoriesName = item.name;
       },
       change_productionLineId(item, index) {

src/views/rulesManagement/components/programRulesDialog.vue

@@ -679,7 +679,7 @@ export default {
             id: item.id,
             ruleId: item.ruleId,
             name: item.ruleName,
-            code: item.code,
+            code: item.ruleCode,
             categoryId: item.categoryId,
             equipmentList: item.deviceInfo.map((item) => {
               return {
@@ -942,7 +942,7 @@ export default {
       // console.log('res------', res);
       // this.matterRulesList = res.ruleItems;
     },
-    
+
     async addRule() {
       console.log(this.ruleIdList);
       console.log(this.ruleId);

src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -872,7 +872,7 @@
           this.getDetils(row.id);
         }
 
-        // 过程监测临时修改
+        // 过程控制临时修改
         if (type == 'processEdit') {
           this.processEditSetValue(row);
         }
@@ -890,7 +890,7 @@
 
         console.log('this.formData', this.formData);
       },
-      // 过程监测 修改规则详情
+      // 过程控制 修改规则详情
       async processEditSetValue(row) {
         const data = await recordrulesGetById(row.rulesId);
 
@@ -1498,7 +1498,7 @@
           this.formData.isExecuteMethod = 1;
         }
       },
-      // 过程监测修改 保存
+      // 过程控制修改 保存
       processEditSave() {
         // 只验证详情内容
         if (this.formData.details.length == 0) {

src/views/technology/production/components/user-edit.vue

@@ -512,7 +512,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否投料后再过程监测:" label-width="200px">
+          <el-form-item label="是否投料后再过程控制:" label-width="200px">
             <el-radio-group v-model="form.isFeedCheckProduction">
               <el-radio
                 :label="item.value"
@@ -524,7 +524,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否过程监测后再产后检查:" label-width="200px">
+          <el-form-item label="是否过程控制后再产后检查:" label-width="200px">
             <el-radio-group v-model="form.isPostCheckProduction">
               <el-radio
                 :label="item.value"

src/views/technology/production/components/user-setting-matter-add.vue

@@ -147,7 +147,7 @@
     mixins: [dictMixins, tableColumnsMixin],
     emits: ['addMatter', 'editMatter'],
     props: {
-      // 记录规则 NotProduceTaskConfig bool 是否排除已配置的记录规则 过程监测传true
+      // 记录规则 NotProduceTaskConfig bool 是否排除已配置的记录规则 过程控制传true
       notProduceTaskConfig: {
         type: Boolean,
         default: false
@@ -273,7 +273,7 @@
         );
         console.log('this.formData.produceTaskId', this.formData.produceTaskId);
         if (reportWorkType === '2') {
-          // 过程监测
+          // 过程控制
           this.formData.itemType = '2';
           this.formData.executeMethod = '2';
         }

src/views/technology/production/components/user-setting-matter-process.vue

@@ -212,7 +212,7 @@
       },
       tabPaneList() {
         const list = this.dict['record_rules_report_work_type'] || [];
-        // 只显示过程监测
+        // 只显示过程控制
         return list.filter((item) => item.dictCode + '' == '2');
       }
     },

src/views/technology/production/components/user-setting-matter.vue

@@ -167,7 +167,7 @@
       },
       tabPaneList() {
         const list = this.dict['record_rules_report_work_type'] || [];
-        // 排除过程监测
+        // 排除过程控制
         return list.filter(
           (item) => item.dictCode != '2' && item.dictCode != '4'
         );

src/views/technology/production/index.vue

@@ -168,7 +168,7 @@
 
     <WorkCenter ref="centerRefs" @changeCenter="determineChoose" />
 
-    <!-- 配置事项 过程监测 -->
+    <!-- 配置事项 过程控制 -->
     <userSettingMatterProcessDrawer
       ref="userSettingMatterProcessDrawerRef"
     ></userSettingMatterProcessDrawer>