Kaynağa Gözat

记录规则添加排序列,按钮名称修改

lucw 7 ay önce
ebeveyn
işleme
c1f6218fd2

+ 34 - 5
src/views/rulesManagement/releaseRules/components/permitAdd.vue

@@ -227,6 +227,18 @@
           </div>
           </div>
         </template>
         </template>
 
 
+        <template v-slot:sortNum="{ row }">
+          <el-input-number
+            style="width: 80px"
+            v-model.number="row.sortNum"
+            placeholder="请输入排序"
+            size="mini"
+            type="number"
+            :min="1"
+            controls-position="right"
+          ></el-input-number>
+        </template>
+
         <template v-slot:paramType="{ row }">
         <template v-slot:paramType="{ row }">
           <el-select
           <el-select
             v-model="row.paramType"
             v-model="row.paramType"
@@ -578,6 +590,13 @@
             align: 'center',
             align: 'center',
             label: '序号'
             label: '序号'
           },
           },
+          {
+            prop: 'sortNum',
+            label: '排序',
+            align: 'center',
+            slot: 'sortNum',
+            minWidth: 110
+          },
           {
           {
             prop: 'paramType',
             prop: 'paramType',
             label: '参数类型',
             label: '参数类型',
@@ -1168,10 +1187,10 @@
                   break;
                   break;
                 }
                 }
                 varsSet.add(t);
                 varsSet.add(t);
-                // 校验变量是否存在于其他明细
-                if (!availableParams.includes(t)) {
+                // 校验变量是否存在于其他明细 排除要求生产数量
+                if (!availableParams.includes(t) && t != '要求生产数量') {
                   this.$message.warning(
                   this.$message.warning(
-                    `公式中引用的参数 ${t} 未在非计算类型的明细中定义`
+                    `公式中引用的参数 "${t}" 未在非计算类型的明细中定义`
                   );
                   );
                   invalid = true;
                   invalid = true;
                   break;
                   break;
@@ -1267,7 +1286,7 @@
 
 
         // details 根据下标添加 sortNum
         // details 根据下标添加 sortNum
         body.details = body.details.map((item, index) => {
         body.details = body.details.map((item, index) => {
-          return { ...item, sortNum: index + 1 };
+          return { ...item };
         });
         });
 
 
         return body;
         return body;
@@ -1314,6 +1333,15 @@
       },
       },
       // 添加
       // 添加
       addRow() {
       addRow() {
+        // 最大sortNum 值 +1
+        let sortNum = 1;
+        if (this.formData.details.length > 0) {
+          const maxSortNum = Math.max(
+            ...this.formData.details.map((item) => item.sortNum || 0)
+          );
+          sortNum = maxSortNum + 1;
+        }
+
         this.formData.details.push({
         this.formData.details.push({
           id: new Date().getTime(),
           id: new Date().getTime(),
           defaultValue: '',
           defaultValue: '',
@@ -1335,7 +1363,8 @@
           _paramSelect: null,
           _paramSelect: null,
           _opSelect: null,
           _opSelect: null,
           _replaceOrAppend: '',
           _replaceOrAppend: '',
-          formulaParts: []
+          formulaParts: [],
+          sortNum
         });
         });
         console.log('this.formData.details', this.formData.details);
         console.log('this.formData.details', this.formData.details);
       },
       },

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

@@ -524,7 +524,7 @@
           </el-form-item>
           </el-form-item>
         </el-col>
         </el-col>
         <el-col :span="12">
         <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-group v-model="form.isPostCheckProduction">
               <el-radio
               <el-radio
                 :label="item.value"
                 :label="item.value"