通用规则新增修改

ruoyi-ui/src/views/ActSuppliesConvert/convert/index.vue

@@ -162,7 +162,15 @@
               <div v-for="index in instea" :key="index" v-if="">
 
                   <el-form-item label="导入表行/列/单元格选择" prop="detailMH" class="form-item-inline">
-                      <el-input-number size="medium" v-model="ZE[index-1]" :min="1" :step="1">1</el-input-number>
+<!--                      <el-input-number size="medium" v-model="ZE[index-1]" :min="1" :step="1">1</el-input-number>-->
+                      <el-select v-model="ZE[index-1]" filterable placeholder="请选择运算方法" >
+                          <el-option
+                              v-for="option in optionsOne"
+                              :key="option.operationName"
+                              :label="option.operationName"
+                              :value="option.id"
+                          ></el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="导入表列坐标" prop="detailML" class="form-item-inline">
                       <el-input-number size="medium" v-model="CE[index-1]" :min="1" :step="1">1</el-input-number>
@@ -170,20 +178,28 @@
                   <el-form-item label="导入表行坐标" prop="detailYH" class="form-item-inline">
                       <el-input-number size="medium" v-model="RE[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
-                  <el-form-item label="导入表单元格长度" prop="detailYL" class="form-item-inline">
+                  <el-form-item label="导入表长度" prop="detailYL" class="form-item-inline">
                       <el-input-number size="medium" v-model="LE[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
 
-                  <el-form-item label="模板表行坐标" prop="detailMH" class="form-item-inline">
-                      <el-input-number size="medium" v-model="ZT[index-1]" :min="1" :step="1">1</el-input-number>
+                  <el-form-item label="模板表行/列/单元格选择" prop="detailMH" class="form-item-inline">
+<!--                      <el-input-number size="medium" v-model="ZT[index-1]" :min="1" :step="1">1</el-input-number>-->
+                      <el-select v-model="ZT[index-1]" filterable placeholder="请选择运算方法" >
+                          <el-option
+                              v-for="option in optionsOne"
+                              :key="option.operationName"
+                              :label="option.operationName"
+                              :value="option.id"
+                          ></el-option>
+                      </el-select>
                   </el-form-item>
                   <el-form-item label="模板表列坐标" prop="detailML" class="form-item-inline">
                       <el-input-number size="medium" v-model="CT[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
-                  <el-form-item label="导入表行坐标" prop="detailYH" class="form-item-inline">
+                  <el-form-item label="模板表行坐标" prop="detailYH" class="form-item-inline">
                       <el-input-number size="medium" v-model="RT[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
-                  <el-form-item label="导入表列坐标" prop="detailYL" class="form-item-inline">
+                  <el-form-item label="模板表长度" prop="detailYL" class="form-item-inline">
                       <el-input-number size="medium" v-model="LT[index-1]" :min="1" :step="1">1</el-input-number>
                   </el-form-item>
 
@@ -276,6 +292,7 @@ export default {
         //运算方法/0无运算方法/1加法/2减法/3乘法/4除法/5平均值/6最大值/7最小值
         options2:[{id:0,operationName:"无运算方法"},{id:1,operationName:"加法运算"},{id:2,operationName:"减法运算"},{id:3,operationName:"乘法运算"},{id:4,operationName:"除法运算"},{id:5,operationName:"平均值"},{id:6,operationName:"最大值"},{id:7,operationName:"最小值"}],
         options3:{},
+        optionsOne:[{id:1,operationName:"行"},{id:2,operationName:"列"},{id:3,operationName:"单元格"}],
 
         // 表单校验
       rules: {
@@ -323,7 +340,7 @@ export default {
           this.RT[this.instea-1]=1;
           this.LT[this.instea-1]=1;
 
-          this.YS[this.instea-1]=1;
+          this.YS[this.instea-1]=0;
 
       },
 
@@ -352,7 +369,8 @@ export default {
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null
+        updateTime: null,
+          YS:0,
       };
       this.resetForm("form");
     },
@@ -374,6 +392,9 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+
+        this.instea=0;
+
       this.reset();
       this.open = true;
       this.title = "添加通用规则";
@@ -384,6 +405,23 @@ export default {
       const id = row.id || this.ids
       getConvert(id).then(response => {
         this.form = response.data;
+        let content = response.data.content;
+        let parse = JSON.parse(content);
+
+          this.ZE=parse.map(obj => parseInt(obj.ze));
+          this.CE=parse.map(obj => parseInt(obj.ce) + 1);
+          this.RE=parse.map(obj => parseInt(obj.re) + 1);
+          this.LE=parse.map(obj => parseInt(obj.le));
+
+          this.ZT=parse.map(obj => parseInt(obj.zt));
+          this.CT=parse.map(obj => parseInt(obj.ct) + 1);
+          this.RT=parse.map(obj => parseInt(obj.rt) + 1);
+          this.LT=parse.map(obj => parseInt(obj.lt));
+
+          this.YS=parse.map(obj => parseInt(obj.ys));
+
+            this.instea =this.YS.length;
+
         this.open = true;
         this.title = "修改通用规则";
       });

ruoyi-ui/src/views/system/suppliesroledetail/index.vue

@@ -485,6 +485,8 @@ export default {
                 this.options3 = response.rows;
             })
 
+
+
             this.instea=0;
             this.getnameid();
             this.reset();
@@ -522,7 +524,6 @@ export default {
             }
 
 
-
         },
         /** 提交按钮 */
         submitForm() {
@@ -561,6 +562,7 @@ export default {
                 type: "warning"
             }).then(function() {
                 return delSuppliesroledetail(ids);
+
             }).then(() => {
                 this.getList();
                 this.msgSuccess("删除成功");