Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/src/views/bussiness/dialogCompments/test-component/KuCun/KC02.vue

@@ -63,7 +63,7 @@ export default {
       rules: {
         // goodsno: [{ required: true, message: "请选择材料", trigger: "change" }],
         quantitystock: [
-          { required: true, message: "请输入生产数量", trigger: "change" },
+          { required: true, message: "请输入生产数量", trigger: "blur" },
         ],
       },
     };

zkqy-ui/src/views/system/bpmnPro/components/Panel/index.vue

@@ -90,6 +90,12 @@ export default {
       // allRoleList: this.allRoleList,
     };
   },
+  inject: {
+    processType: {
+      from: "processType",
+      default: "",
+    },
+  },
   created() {
     EventEmitter.on("modeler-init", (modeler) => {
       // 导入完成后默认选中 process 节点
@@ -114,6 +120,20 @@ export default {
     // this.getAllUserList();
     !this.currentElementId && this.setCurrentElement();
   },
+  computed: {
+    myProcessType() {
+      return this.processType();
+    },
+  },
+  watch: {
+    myProcessType: {
+      handler(val) {
+        console.log(val, 1111);
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
   methods: {
     //
     setCurrentElement: debounce(function (element) {

zkqy-ui/src/views/system/bpmnPro/components/Toolbar/tools/Save.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button @click="saveHandler" type="primary" size="small">保存 </el-button>
+  <el-button @click="saveHandler" type="primary" size="small">保存</el-button>
 </template>
 
 <script>
@@ -25,6 +25,16 @@ import getNodeSequence from "@/utils/bpmn/getNodeSequence";
 import moment from "moment";
 export default {
   name: "BpmnSave",
+  dicts: ["bpm_type"],
+  data() {
+    return {
+      show: true,
+      processForm: {
+        processType: "0",
+      },
+      rules: {},
+    };
+  },
   computed: {
     ...mapGetters(["getModeler"]),
   },
@@ -36,8 +46,14 @@ export default {
       from: "nodeData",
       default: {},
     },
+    processType: {
+      from: "processType",
+      default: "",
+    },
   },
   methods: {
+    // 流程类型的确认回调
+    confirmHandler() {},
     async getProcess(type, name = "diagram") {
       try {
         if (!this.getModeler)
@@ -126,7 +142,7 @@ export default {
           "";
         console.log(warnings.find((item) => item.property == prefix + ":note"));
       }
-      formData.processType = "0"; //流程类型
+      formData.processType = this.processType(); //流程类型
       // 获取xml标签内容标签内容
       let xmlPro = await this.getProcess("xml");
       var xmlObj = this.xmlStr2XmlObj(xmlPro);

zkqy-ui/src/views/system/bpmnPro/index.vue

@@ -6,9 +6,48 @@
       <bpmn-panel v-if="getEditorConfig.penalMode === 'custom'" />
       <div v-else class="camunda-panel" id="camunda-panel"></div>
     </div>
-
     <bpmn-settings v-show="false" />
     <bpmn-context-menu />
+    <el-dialog
+      title="请选择流程类型"
+      :visible.sync="show"
+      width="30%"
+      append-to-body
+      destroy-on-close
+      :center="true"
+    >
+      <el-form
+        :model="processForm"
+        ref="ProcessFormRef"
+        :rules="rules"
+        label-width="80px"
+        :inline="false"
+        size="normal"
+      >
+        <el-form-item label="流程类型">
+          <el-select
+            v-model="processForm.processType"
+            placeholder="请选择流程类型"
+            filterable
+          >
+            <el-option
+              v-for="item in dict.type.bpm_type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <template #footer>
+        <span>
+          <el-button @click="cancelHandler">取消</el-button>
+          <el-button type="primary" @click="confirmHandler">确认</el-button>
+        </span>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -44,6 +83,7 @@ import { listRole } from "@/api/system/role";
 
 export default {
   name: "App",
+  dicts: ["bpm_type"],
   components: {
     BpmnPanel,
     BpmnContextMenu,
@@ -60,6 +100,13 @@ export default {
       allScriptList: [],
       allUserList: [],
       allRoleList: [],
+
+      // 流程类型数据
+      show: true,
+      processForm: {
+        processType: "0",
+      },
+      rules: {},
     };
   },
   computed: {
@@ -72,6 +119,7 @@ export default {
       allScriptList: () => this.allScriptList,
       allUserList: () => this.allUserList,
       allRoleList: () => this.allRoleList,
+      processType: () => this.processForm.processType,
     };
   },
   methods: {
@@ -131,6 +179,14 @@ export default {
         this.$message.warning("网络异常,请稍后再试");
       }
     },
+    confirmHandler() {
+      this.show = false;
+    },
+    cancelHandler() {
+      this.show = false;
+      this.$tab.closePage();
+      this.$router.back();
+    },
   },
   async mounted() {
     document.body.addEventListener("contextmenu", this.Provence);