Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/BIZComponents/enventSubmitDialog/processSubmitDialog.vue

@@ -152,7 +152,9 @@
         v-click-once
         >提交并发布</el-button
       >
-      <el-button size="small" @click="isCloseRefresh ? cancel() : cancel1()">关闭</el-button>
+      <el-button size="small" @click="isCloseRefresh ? cancel() : cancel1()"
+        >关闭</el-button
+      >
     </div>
   </ele-modal>
 </template>
@@ -210,7 +212,7 @@
       isCloseRefresh: {
         type: Boolean,
         default: true
-      },
+      }
     },
     data() {
       return {
@@ -294,7 +296,7 @@
     methods: {
       init(row = {}) {
         this.form = { ...this.form, ...row };
-        console.log(row)
+        console.log(row);
         // this.form.businessId = row.id;
         // this.form.businessKey = row.businessKey;
         // this.form.formCreateUserId = row.createUserId;
@@ -361,6 +363,12 @@
               return roleOption.name;
             }
           }
+        } else if (row.type == 11) {
+          for (const roleOption of this.roleOptions) {
+            if (roleOption.id === option) {
+              return roleOption.name;
+            }
+          }
         } else if (row.type === 20 || row.type === 21) {
           for (const deptOption of this.deptOptions) {
             if (deptOption.id === option) {
@@ -393,11 +401,9 @@
         } else if (row.type === 70) {
           let data = JSON.parse(row.variableName);
           if (data.direction == 1) {
-            return topLevel2.find((item) => item.value == data.topLevel)
-              ?.label;
+            return topLevel2.find((item) => item.value == data.topLevel)?.label;
           } else {
-            return topLevel1.find((item) => item.value == data.topLevel)
-              ?.label;
+            return topLevel1.find((item) => item.value == data.topLevel)?.label;
           }
         }
         return '未知(' + option + ')';
@@ -461,10 +467,10 @@
         }
         this.loading = true;
         try {
-          console.log(this.form)
-          
+          console.log(this.form);
+
           let params = {
-          ...this.form,
+            ...this.form,
             variables: {
               // businessName: data.supplierName,
               ...this.form.variables
@@ -496,8 +502,8 @@
       },
       cancel1() {
         this.$emit('update:processSubmitDialogFlag', false);
-      },
+      }
     }
   };
 </script>
-<style scoped lang="scss"></style>
+<style scoped lang="scss"></style>

src/BIZComponents/processSubmitDialog/processSubmitDialog.vue

@@ -383,7 +383,9 @@
       <!--        @click="() => (active = 0)"-->
       <!--        >上一步-->
       <!--      </el-button>-->
-      <el-button type="primary" size="small" v-click-once @click="submit">提交</el-button>
+      <el-button type="primary" size="small" v-click-once @click="submit"
+        >提交</el-button
+      >
       <el-button size="small" @click="cancel">关闭</el-button>
       <!--      <visibility-range-dialog-->
       <!--        :visibilityRangeDialogFlag.sync="visibilityRangeDialogFlag"-->
@@ -731,7 +733,7 @@ this.postOptions.push(...response.data);
         parameterGetByCode({
           code: 'wt_collaborative_bpm'
         }).then((res) => {
-          if (!res.value||res.value=='1') {
+          if (!res.value || res.value == '1') {
             this.form.FQLC = info?.id;
             this.form.name = this.title;
             this.form.key = info?.key;
@@ -787,6 +789,12 @@ this.postOptions.push(...response.data);
               return roleOption.name;
             }
           }
+        } else if (row.type == 11) {
+          for (const roleOption of this.roleOptions) {
+            if (roleOption.id === option) {
+              return roleOption.name;
+            }
+          }
         } else if (row.type === 20 || row.type === 21) {
           for (const deptOption of this.deptOptions) {
             if (deptOption.id === option) {
@@ -886,13 +894,16 @@ this.postOptions.push(...response.data);
         });
       },
       generateFormValid(validate = true) {
-        return this.$refs.generateForm.getData(validate).then((data) => {
-          return data;
-        }).catch((err) => {
-          this.$message.error(err);
-          console.log(err);
-          throw err;
-        });
+        return this.$refs.generateForm
+          .getData(validate)
+          .then((data) => {
+            return data;
+          })
+          .catch((err) => {
+            this.$message.error(err);
+            console.log(err);
+            throw err;
+          });
       },
       handleTreeChange() {
         this.$nextTick(() => {
@@ -950,7 +961,11 @@ this.postOptions.push(...response.data);
 
           // 如果有未填写的组件，显示提示信息
           if (emptyComponents.length > 0) {
-            this.$message.warning(`请填写完整信息：${emptyComponents.map(comp => this.getComponentName(comp)).join('、')}`);
+            this.$message.warning(
+              `请填写完整信息：${emptyComponents
+                .map((comp) => this.getComponentName(comp))
+                .join('、')}`
+            );
             // this.$message.warning(`请填写完整信息`);
             return false;
           }
@@ -976,11 +991,13 @@ this.postOptions.push(...response.data);
           console.log('this.form.dictList', this.dictList);
           await processInstanceCreateAPI({
             ...this.form,
-            variables: { 
-              ...this.form.valueJson, 
+            variables: {
+              ...this.form.valueJson,
               businessCode: this.form.code,
               businessName: this.form.name,
-              businessType: this.dictList['collaborative_type']?.find(item => item.value == this.form.dictType)?.label
+              businessType: this.dictList['collaborative_type']?.find(
+                (item) => item.value == this.form.dictType
+              )?.label
             }
           });
           this.$message('提交审核成功');

vue.config.js

@@ -38,11 +38,11 @@ module.exports = {
         // target: 'http://124.71.68.31:50001', // 测试环境
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.105:18086',
-        // target: 'http://192.168.1.3:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.3:18086',
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://192.168.1.3:18086',