Преглед на файлове

模板页面操作按钮添加不等条件

lph преди 1 година
родител
ревизия
e0df321e82
променени са 2 файла, в които са добавени 7 реда и са изтрити 17 реда
  1. 3 13
      zkqy-ui/src/views/bussiness/processMange.vue
  2. 4 4
      zkqy-ui/src/views/tablelist/commonTable/BtnMenu.vue

+ 3 - 13
zkqy-ui/src/views/bussiness/processMange.vue

@@ -197,19 +197,7 @@
             ref="myFormRef"
             v-if="myForm"
           ></component>
-          <!-- <AssignEmployees :formData="formData"
-          :row="row"></AssignEmployees> -->
-          <!-- <NodeShow ref="myFormRef" :formData="formData" :row="row"></NodeShow>
-          -->
-
-          <!-- <SC01 :formData="formData"
-          :row="row"></SC01> -->
-
-          <!-- <AssignEmployees></AssignEmployees> -->
-
-          <!-- <CG1 ref="myFormRef"></CG1>
-          <KC1 ref="myFormRef"></KC1> -->
-          <!-- <GY06 ref="myFormRef" :formData="formData" :row="row"></GY06> -->
+          <!-- <RecordSplitData /> -->
           <span slot="footer" class="dialog-footer">
             <el-button @click="closeExecuteNode">取消</el-button>
             <el-button type="primary" @click="executeNode">运行</el-button>
@@ -254,6 +242,7 @@ import NodeShow from "./dialogCompments/Mec/NodeShow.vue";
 import RecordQuality from "./dialogCompments/Mec/RecordQuality.vue";
 import ProductionProcesses from "./dialogCompments/Mec/ProductionProcesses.vue";
 import PersonalDistribution from "./dialogCompments/Mec/PersonalDistribution.vue";
+import RecordSplitData from "./dialogCompments/Mec/RecordSplitData.vue";
 
 export default {
   name: "processMange",
@@ -278,6 +267,7 @@ export default {
     RecordQuality,
     ProductionProcesses,
     PersonalDistribution,
+    RecordSplitData,
   },
   dicts: ["bpm_type", "task_process_state"],
   data() {

+ 4 - 4
zkqy-ui/src/views/tablelist/commonTable/BtnMenu.vue

@@ -63,7 +63,6 @@ export default {
       btnObj.children = btnObj.children.filter((item) => {
         return !this.isHiddenBtn(this.row, item.btnShowCondition);
       });
-      console.log("btnObj", btnObj);
       return btnObj;
     },
   },
@@ -72,14 +71,13 @@ export default {
     isHiddenBtn(row, condition) {
       if (condition.length == 0) return false;
       let con = JSON.parse(condition);
-      let res = con.every((item) => {
-        return !this.judgeBtnHandler(row, item);
+      let res = con.some((item) => {
+        return this.judgeBtnHandler(row, item);
       });
       return res;
     },
     judgeBtnHandler(row, con) {
       let { fieldName, refValue, mark } = con;
-      console.log(row[fieldName], mark, refValue);
       switch (mark) {
         case ">":
           return row[fieldName] > refValue;
@@ -91,6 +89,8 @@ export default {
           return row[fieldName] >= refValue;
         case "<=":
           return row[fieldName] <= refValue;
+        case "!=":
+          return row[fieldName] != refValue;
         default:
           return true;
       }