cloud-web-corejs 1.0.54-dev.183 → 1.0.54-dev.185

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

@@ -93,56 +93,6 @@
                       </el-select>
                     </template>
                   </vxe-form-item>
-
-                  <vxe-form-item :title="$t1('机构')+':'" field="param4">
-                    <template v-slot>
-                      <el-input
-                        class="search-input"
-                        max="200"
-                        v-model="formData.param4"
-                        @clear="
-                          formData.param3 = null;
-                          $forceUpdate();
-                        "
-                        v-el-readonly
-                        clearable
-                      >
-                        <i slot="suffix" class="el-input__icon el-icon-search"
-                           @click="showSaleOrgDialog = true"></i>
-                      </el-input>
-                    </template>
-                  </vxe-form-item>
-                  <vxe-form-item :title="$t1('大区')+':'" field="param6">
-                    <template v-slot>
-                      <el-input
-                        class="search-input"
-                        max="200"
-                        v-model="formData.param6"
-                        @clear="
-                          formData.param5 = null;
-                          $forceUpdate();
-                        "
-                        v-el-readonly
-                        clearable
-                      >
-                        <i slot="suffix" class="el-input__icon el-icon-search"
-                           @click="showAreaDialog = true"></i>
-                      </el-input>
-                    </template>
-                  </vxe-form-item>
-
-                  <vxe-form-item :title="$t1('产品线')+':'" field="param7">
-                    <template v-slot>
-                      <el-input v-model="formData.param7" size="small" clearable/>
-                    </template>
-                  </vxe-form-item>
-
-                  <vxe-form-item :title="$t1('授权医院')+':'" field="param8">
-                    <template v-slot>
-                      <el-input v-model="formData.param8" size="small" clearable/>
-                    </template>
-                  </vxe-form-item>
-
                 </vxe-form>
               </template>
             </vxe-grid>
@@ -202,54 +152,6 @@
                     </el-select>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('机构')+':'" field="param4">
-                  <template v-slot>
-                    <el-input
-                      class="search-input"
-                      max="200"
-                      v-model="formData2.param4"
-                      @clear="
-                        formData2.param3 = null;
-                        $forceUpdate();
-                      "
-                      v-el-readonly
-                      clearable
-                    >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="showSaleOrgDialog = true"></i>
-                    </el-input>
-                  </template>
-                </vxe-form-item>
-                <vxe-form-item :title="$t1('大区')+':'" field="param6">
-                  <template v-slot>
-                    <el-input
-                      class="search-input"
-                      max="200"
-                      v-model="formData2.param6"
-                      @clear="
-                        formData2.param5 = null;
-                        $forceUpdate();
-                      "
-                      v-el-readonly
-                      clearable
-                    >
-                      <i slot="suffix" class="el-input__icon el-icon-search"
-                         @click="showAreaDialog2 = true"></i>
-                    </el-input>
-                  </template>
-                </vxe-form-item>
-
-                <vxe-form-item :title="$t1('产品线')+':'" field="param7">
-                  <template v-slot>
-                    <el-input v-model="formData2.param7" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
-
-                <vxe-form-item :title="$t1('授权医院')+':'" field="param8">
-                  <template v-slot>
-                    <el-input v-model="formData2.param8" size="small" clearable/>
-                  </template>
-                </vxe-form-item>
               </vxe-form>
             </template>
           </vxe-grid>
@@ -260,28 +162,15 @@
                        @confirm="confirmInsertWfObjConfig" :multi="false"></wfObjConfigDialog>
     <wfObjConfigDialog v-if="showWfObjConfigDialog2" :visiable.sync="showWfObjConfigDialog2" :type="99"
                        @confirm="confirmInsertWfObjConfig2" :multi="false"></wfObjConfigDialog>
-
-
-
-    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" @confirm="confirmInsertSaleOrg" :multi="false"></saleOrgDialog>
-
-    <saleOrgDialog v-if="showSaleOrgDialog2" :visiable.sync="showSaleOrgDialog2" @confirm="confirmInsertSaleOrg2" :multi="false"></saleOrgDialog>
-
-    <areaDialog v-if="showAreaDialog" :visiable.sync="showAreaDialog"
-                   @confirm="confirmInsertArea" :multi="false"></areaDialog>
-    <areaDialog v-if="showAreaDialog2" :visiable.sync="showAreaDialog2"
-                       @confirm="confirmInsertArea2" :multi="false"></areaDialog>
   </div>
 </template>
 <script>
 import {treeScollx} from '@base/utils/global.js';
-import wfObjConfigDialog from '@base/views/user/wf/wf_obj_config/dialog.vue';
-import saleOrgDialog from '@base/views/user/sale_org/dialog.vue';
-import areaDialog from '@base/views/user/area/dialog.vue';
+import wfObjConfigDialog from '../../../../views/user/wf/wf_obj_config/dialog.vue';
 
 export default {
   name: 'wf_manage:list',
-  components: {wfObjConfigDialog,saleOrgDialog,areaDialog},
+  components: {wfObjConfigDialog},
   created() {
   },
   async mounted() {
@@ -292,12 +181,6 @@ export default {
   },
   data() {
     return {
-      showSaleOrgDialog:false,
-      showSaleOrgDialog2:false,
-      showAreaDialog:false,
-      showAreaDialog2:false,
-
-
       activeName: 'second',
       // dataId: 0,
       // showEdit: false,
@@ -785,36 +668,6 @@ export default {
         this.$set(this.formData2, 'objTypeCode', row.objTypeCode);
       }
     },
-
-    confirmInsertArea(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.$set(this.formData, 'param5', row.id+"");
-        this.$set(this.formData, 'param6', row.name);
-      }
-    },
-    confirmInsertSaleOrg(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.$set(this.formData, 'param3', row.id+"");
-        this.$set(this.formData, 'param4', row.name);
-      }
-    },
-    confirmInsertArea2(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.$set(this.formData2, 'param3', row.id+"");
-        this.$set(this.formData2, 'param4', row.name);
-      }
-    },
-    confirmInsertSaleOrg2(rows) {
-      if (rows.length) {
-        let row = rows[0];
-        this.$set(this.formData2, 'param5', row.id+"");
-        this.$set(this.formData2, 'param6', row.name);
-      }
-    },
-
   }
 };
 </script>

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/list.vue

@@ -113,6 +113,8 @@
     <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: {
@@ -467,7 +474,7 @@ export default {
             width: 200
           },
           {
-            width: 100,
+            width: 200,
             fixed: 'right',
             sortable: false,
             title: '',
@@ -497,7 +504,31 @@ export default {
                                 popper-class="tooltip-skin">
                       <i class="iconfont icon-liuchengguanli-shejiqi_liucheng"/>
                     </el-tooltip>
-                  </a>
+                  </a>,
+                  <a
+                    href="javascript:void(0);"
+                    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"
+                                popper-class="tooltip-skin">
+                      <i class="el-icon-download"/>
+                    </el-tooltip>
+                  </a>,
                 ];
               }
             }
@@ -623,6 +654,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 => {
+
+            }
+          });
+        }
+      });
     }
   }
 };