cloud-web-corejs 1.0.54-dev.26 → 1.0.54-dev.260

package/src/views/user/user/list.vue

@@ -73,9 +73,6 @@
 import editView from './form_edit.vue';
 import {treeScollx} from '@base/utils/global.js';
 import tableForm from "@base/components/table/tableForm";
-import {
-  Loading,
-} from 'element-ui';
 
 export default {
   name: 'user:form_list',
@@ -94,12 +91,6 @@ export default {
   },
   activated() {
     // this.initTableList();
-    /*let opts = {
-      lock: true,
-      background: 'unset',
-      target: this.$el
-    };
-    Loading.service(opts);*/
   },
   async mounted() {
     treeScollx({target: this, type: 'default'});
@@ -226,7 +217,7 @@ export default {
           };
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             formData.neRoleCodes = [...outUserCodes];
           } else if (this.userType == 2) {
             //外部用户
@@ -488,14 +479,7 @@ export default {
         excel: USER_PREFIX + '/excelTemplate/user/user.xlsx',
         multi: true,
         saveUrl: USER_PREFIX + '/user/batchImport',
-        onBeforeConfirm: ({data,successRows,failRows}) => {
-
-        },
-        onBeforeCancel: ({data,successRows,failRows}) => {
-
-        },
-        callback: ({data,successRows,failRows}) => {
-          debugger
+        callback: () => {
           that.searchEvent();
         }
       });
@@ -509,7 +493,7 @@ export default {
             let rows = res.objx || [];
             let outUserCodes = this.outUserCodes;
             if (this.userType == 1) {
-              //企业用户
+              //组织用户
               rows = rows.filter(row => !outUserCodes.includes(row.code));
             } else if (this.userType == 2) {
               //外部用户
@@ -551,7 +535,7 @@ export default {
           let rows = res.objx || [];
           let outUserCodes = this.outUserCodes;
           if (this.userType == 1) {
-            //企业用户
+            //组织用户
             rows = rows.filter(row => !outUserCodes.includes(row.code));
           } else if (this.userType == 2) {
             //外部用户

package/src/views/user/wf/wf_manage/list.vue

@@ -370,7 +370,7 @@ export default {
           dataId: wfDataId
         };
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = {
           _dataId: wfDataId

package/src/views/user/wf/wf_manage/wfContentDialog.vue

@@ -87,7 +87,7 @@ export default {
           dataId: wfDataId
         });
         let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@/views' + url).default;
+        this.wfContent = require('@base/views' + url).default;
       } else {
         this.param = Object.assign(param, {
           _dataId: wfDataId

package/src/views/user/wf/wf_obj_config/importItemDialog.vue

@@ -0,0 +1,109 @@
+<template>
+    <el-dialog
+      :title="$t1('导入流程模板XML')"
+      :append-to-body="falseValue"
+      :modal-append-to-body="falseValue"
+      :close-on-click-modal="falseValue"
+      :visible.sync="showImportDialog"
+      :modal="falseValue"
+      custom-class="dialog-style"
+      width="501px"
+      v-el-drag-dialog
+    >
+      <div class="import-box">
+        <!--        <div class="tips">{{ $t2('请下载文件模板，填写信息后再上传文件', 'components.excelImport.tip') }}</div>-->
+        <el-upload v-if="!fileRaw" ref="uploadBtn" action="" class="upload-file" :auto-upload="false"
+                   :on-change="fileChange" accept=".xml">
+          <div class="el-upload-dragger">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text"><em>{{ $t2('点击上传', 'components.excelImport.uploadBUtton') }}</em></div>
+          </div>
+        </el-upload>
+        <div class="upload-finish" v-if="fileRaw">
+          <img :src="require('@/resources' + '/images/ico-txt.svg')" class="ico"/>
+          <p class="name">{{ fileRaw.name }}</p>
+          <!-- <p>2022-1-17</p> -->
+          <el-tooltip :enterable="false" class="item" effect="dark"
+                      :content="$t2('关闭', 'components.excelImport.closeBUtton')" placement="bottom">
+            <i
+              class="el-icon-error js-close"
+              @click="
+								fileRaw = false;
+								$refs.uploadBtn.clearFiles();
+							"
+            ></i>
+          </el-tooltip>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+				<el-button type="primary" plain class="button-sty" @click="dialogClose1">
+					<i class="el-icon-close el-icon"></i>
+					{{ $t2('取 消', 'system.button.cancel2') }}
+				</el-button>
+				<el-button type="primary" @click="dialogPrimary1" class="button-sty">
+					<i class="el-icon-check el-icon"></i>
+					{{ $t2('确 定', 'system.button.confirm2') }}
+				</el-button>
+			</span>
+    </el-dialog>
+</template>
+
+<script>
+
+export default {
+  name: 'excelImport',
+  data() {
+    return {
+      excTime: 0,
+      showImportDialog: true,
+      showImportDialog2: false,
+      falseValue: false,
+      fileRaw: false,
+      isEnd: false,
+      currentIndex: 0,
+      excelTemplate: "",
+      prefix: '/user',
+      dataSize: 0,
+      totalSuccessNum: 0,
+      totalErrorNum: 0,
+      percentageNum: 0,
+      successRows: [],
+      failRows: [],
+      oriCols: [],
+      showImportResult: false,
+      resultType: '',
+      option: {},
+      showContent: false,
+      resOption: {},
+      abc: "A"
+    }
+  },
+
+  methods: {
+    fileChange(file) {
+      if (file) {
+        this.fileRaw = file.raw;
+      } else {
+        this.fileRaw = false;
+      }
+    },
+    dialogClose1() {
+      this.$emit("update:visiable", false);
+      this.showContent = false;
+    },
+    async dialogPrimary1() {
+      let that = this;
+      if (!(this.fileRaw)) {
+        this.$baseAlert(this.$t2('请上传附件', 'components.excelImport.warmMsg1'));
+        return false;
+      }
+      this.showImportDialog = false;
+
+      this.dialogClose1();
+      this.$emit("confirm",that.fileRaw)
+
+    },
+
+  }
+};
+</script>

package/src/views/user/wf/wf_obj_config/itemEdit.vue

@@ -111,6 +111,14 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                {{ $t1('序号') }}
+              </th>
+              <td>
+                <el-form-item prop="orders" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number autocomplete="off" v-model="wfObjConfigItem.orders" clearable/>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>
@@ -195,7 +203,8 @@ export default {
         startMode: 3,
         skipSameUserTask: false,
         toNextNode: null,
-        enabled: true
+        enabled: true,
+        orders:undefined
       },
       showWfObjConfigDialog: false,
       configServiceId: null,
@@ -233,6 +242,7 @@ export default {
           modalStrictly: true,
           success: res => {
             let wfObjConfigItem = res.objx || {};
+            if(wfObjConfigItem.orders===null)wfObjConfigItem.orders = undefined
             if (wfObjConfigItem.toNextNode === 1) {
               wfObjConfigItem.toRejectNode = null
             }

package/src/views/user/wf/wf_obj_config/list.vue

@@ -105,14 +105,16 @@
       <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
     </el-dialog>
 
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
+    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser" :rows="wfAssignData" labelKey="loginAccount"
                 :multi.sync="wfAssignMulti"/>
-    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" @confirm="confirmPosition"/>
+    <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" :rows="wfAssignPositionData" @confirm="confirmPosition"/>
     <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
                              :visiable.sync="showScriptDescriptionDialog"></scriptDescriptionDialog>
     <wfBizDataSettingDialog v-if="showWfBizDataSettingDialog" :visiable.sync="showWfBizDataSettingDialog"
                             @confirm="confirmWfBizDataSettingDialog"
                             :objConfigItem="objConfigItem" :serviceId="currentRow.serviceId"></wfBizDataSettingDialog>
+
+    <importItemDialog v-if="showImportItemDialog" :visiable.sync="showImportItemDialog" @confirm="confirmImportItemDialog"/>
   </div>
 </template>
 <script>
@@ -128,6 +130,9 @@ import scriptDescriptionDialog from '@base/components/scriptDescription/dialog'
 import wfDiyAttributeEdit from '../../../../views/user/wf/wf_diy_attribute/edit'
 import wfBizDataSettingDialog from "./wfBizDataSettingDialog";
 
+import importItemDialog from "./importItemDialog.vue";
+
+
 
 export default {
   name: 'wf_obj_config:list',
@@ -139,7 +144,8 @@ export default {
     positionDialog,
     scriptDescriptionDialog,
     wfDiyAttributeEdit,
-    wfBizDataSettingDialog
+    wfBizDataSettingDialog,
+    importItemDialog
   },
   created() {
   },
@@ -189,7 +195,8 @@ export default {
       showWfDiyAttributeEdit: false,
 
       objConfigItem: null,
-      showWfBizDataSettingDialog: false
+      showWfBizDataSettingDialog: false,
+      showImportItemDialog:false
     };
   },
   watch: {
@@ -383,6 +390,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
+          {
+            title: this.$t1('序号'),
+            field: 'orders',
+            width: 150
+          },
           {
             title: this.$t1('流程模版KEY'),
             field: 'modelKey',
@@ -467,7 +479,7 @@ export default {
             width: 200
           },
           {
-            width: 150,
+            width: 200,
             fixed: 'right',
             sortable: false,
             title: '',
@@ -500,16 +512,28 @@ export default {
                   </a>,
                   <a
                     href="javascript:void(0);"
-                    onClick={() => {
-                      this.openWfBizDataSettingDialog(row, this.currentRow.serviceId);
+                    class="a-link"
+                    onclick={() => {
+                      this.exportWfXml(row);
                     }}
+                  >
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('导出')} placement="top"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-upload2"/>
+                    </el-tooltip>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
                     class="a-link"
+                    onclick={() => {
+                      this.importWfXml(row);
+                    }}
                   >
-                    <el-tooltip enterable={false} effect="dark" content={this.$t1('配置流程过程更改业务数据')} placement="top"
+                    <el-tooltip enterable={false} effect="dark" content={this.$t1('导入')} placement="top"
                                 popper-class="tooltip-skin">
-                      <i class="el-icon-setting"/>
+                      <i class="el-icon-download"/>
                     </el-tooltip>
-                  </a>
+                  </a>,
                 ];
               }
             }
@@ -635,6 +659,73 @@ export default {
     },
     confirmWfBizDataSettingDialog(rows) {
 
+    },
+     saveAs(blob, filename) {
+      if (window.navigator.msSaveOrOpenBlob) {
+        navigator.msSaveBlob(blob, filename);
+      } else {
+        var link = document.createElement("a");
+        var body = document.querySelector("body");
+
+        link.href = window.URL.createObjectURL(blob);
+        link.download = filename;
+
+        // fix Firefox
+        link.style.display = "none";
+        body.appendChild(link);
+
+        link.click();
+        body.removeChild(link);
+
+        window.URL.revokeObjectURL(link.href);
+      }
+    },
+    exportWfXml(row){
+      this.$baseConfirm(this.$t1('您确定要导出吗？')).then(() => {
+        this.$http({
+          url: '/' + this.currentRow.serviceId + '/wf_obj_config_item/exportModelXml',
+          method: `post`,
+          data: {
+            stringOne:row.modelId
+          },
+          isLoading: true,
+          responseType: "blob",
+          resultType: "other",
+          callback: res => {
+            let fileName = row.modelName + ".bpmn20.xml"
+            this.saveAs(res,fileName)
+          }
+        });
+      });
+    },
+    importWfXml(row){
+      this.importXmlRow = row;
+      this.showImportItemDialog = true;
+    },
+    confirmImportItemDialog(file){
+      var form = new FormData();
+      // 文件对象
+      form.append("file", file);
+      form.append("modelId", this.importXmlRow.modelId);
+      this.$http({
+        url: '/' + this.currentRow.serviceId + '/wf_obj_config_item/importProcess',
+        method: `post`,
+        headers: {
+          'Content-Type': 'multipart/form-data'
+        },
+        data: form,
+        isLoading: true,
+        success: res => {
+          this.$message({
+            message: res.content,
+            type: 'success',
+            duration: 2000,
+            onClose: t => {
+
+            }
+          });
+        }
+      });
     }
   }
 };

package/src/views/user/wf/wf_obj_config/wfBizDataSettingDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      :title="$t1('配置流程过程更改业务数据')"
+      :title="$t1('过程更改业务数据')"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -31,7 +31,7 @@
                   </vxe-button>
                 </div>
                 <div class="fl screen-breadcrumb" style="margin-left: 30px;">
-                  <span style="font-size: 12px;">{{ $t1('表单模板名称') }}：</span>
+                  <span style="font-size: 12px;">{{ $t1('流程模板名称') }}：</span>
                   {{ objConfigItem.modelName }}
                 </div>
               </div>