cloud-web-corejs-haier 1.0.43 → 1.0.45

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

@@ -1,106 +1,106 @@
-<template>
-  <el-dialog
-    :title="$t1('查看单据流程')"
-    :append-to-body="true"
-    :modal-append-to-body="true"
-    :close-on-click-modal="false"
-    :visible.sync="showWfDialog"
-    :modal="false"
-    custom-class="el-dialog dialog-style designer-dialog indexUse"
-    width="100%"
-    height="100%"
-    top="0px"
-    bottom="0px"
-    :destroy-on-close="true"
-    @close="wfClose"
-  >
-    <div id="containt">
-      <component
-        v-if="showWfContent && wfContent"
-        :is="wfContent"
-        visible-key="showWfContent"
-        v-bind="param"
-        :parent-target="_self"
-        :defaultShowWfContent="true"
-        :_viewType="1"
-        @reload="$reloadHandle"
-        :_handleCallback="handleCallback"
-      ></component>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-
-export default {
-  name: "wfContentDialog",
-  props: {
-    option: {
-      type: Object,
-      default: {}
-    }
-  },
-  components: {},
-  data() {
-    return {
-      param: {},
-      wfContent: null,
-      showWfContent: false,
-      showWfDialog: true
-    };
-  },
-  created() {
-    this.openWfDialog();
-  },
-  methods: {
-    handleCallback(flag) {
-      if ([1, 2, 3, 4].includes(flag)) {
-        this.$http({
-          url: USER_PREFIX + "/wf_diy_attribute/getValue",
-          method: `post`,
-          data: {attributeKey: "param4"},
-          isLoading: true,
-          success: (res) => {
-            let val = res.objx || false;
-            this.option._handleCallback && this.option._handleCallback(flag);
-            if (val === true) {
-              this.wfClose();
-            }
-          }
-        });
-      } else {
-        this.option._handleCallback && this.option._handleCallback(flag);
-      }
-    },
-    wfClose() {
-      this.showWfDialog = false;
-      this.$emit('update:visible', false);
-      this.$emit('close');
-    },
-    openWfDialog() {
-      let id = this.option.objId;
-      let wfDataId = !id || typeof id == 'object' ? 0 : Number(id);
-      let param = this.option.param || {};
-      if (this.option.url == 'form') {
-        this.param = Object.assign(param, {
-          formCode: this.option.objTypeCode.substr(9),
-          dataId: wfDataId
-        });
-        let url = '/user/form/vform/render.vue';
-        this.wfContent = require('@base/views' + url).default;
-      } else {
-        this.param = Object.assign(param, {
-          _dataId: wfDataId
-        });
-        let url = this.option.url + '.vue';
-        this.wfContent = require('@/views' + url).default;
-      }
-      this.showWfContent = true;
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <el-dialog
+    :title="$t1('查看单据流程')"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="false"
+    :visible.sync="showWfDialog"
+    :modal="false"
+    custom-class="el-dialog dialog-style designer-dialog indexUse"
+    width="100%"
+    height="100%"
+    top="0px"
+    bottom="0px"
+    :destroy-on-close="true"
+    @close="wfClose"
+  >
+    <div id="containt">
+      <component
+        v-if="showWfContent && wfContent"
+        :is="wfContent"
+        visible-key="showWfContent"
+        v-bind="param"
+        :parent-target="_self"
+        :defaultShowWfContent="true"
+        :_viewType="1"
+        @reload="$reloadHandle"
+        :_handleCallback="handleCallback"
+      ></component>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  name: "wfContentDialog",
+  props: {
+    option: {
+      type: Object,
+      default: {}
+    }
+  },
+  components: {},
+  data() {
+    return {
+      param: {},
+      wfContent: null,
+      showWfContent: false,
+      showWfDialog: true
+    };
+  },
+  created() {
+    this.openWfDialog();
+  },
+  methods: {
+    handleCallback(flag) {
+      if ([1, 2, 3, 4].includes(flag)) {
+        this.$http({
+          url: USER_PREFIX + "/wf_diy_attribute/getValue",
+          method: `post`,
+          data: {attributeKey: "param4"},
+          isLoading: true,
+          success: (res) => {
+            let val = res.objx || false;
+            this.option._handleCallback && this.option._handleCallback(flag);
+            if (val === true) {
+              this.wfClose();
+            }
+          }
+        });
+      } else {
+        this.option._handleCallback && this.option._handleCallback(flag);
+      }
+    },
+    wfClose() {
+      this.showWfDialog = false;
+      this.$emit('update:visible', false);
+      this.$emit('close');
+    },
+    openWfDialog() {
+      let id = this.option.objId;
+      let wfDataId = !id || typeof id === 'object' ? 0 : Number(id);
+      let param = this.option.param || {};
+      if (this.option.url === 'form') {
+        this.param = Object.assign(param, {
+          formCode: this.option.objTypeCode.substr(9),
+          dataId: wfDataId
+        });
+        let url = '/user/form/vform/render.vue';
+        this.wfContent = require('@base/views' + url).default;
+      } else {
+        this.param = Object.assign(param, {
+          _dataId: wfDataId
+        });
+        let url = this.option.url + '.vue';
+        this.wfContent = require('@/views' + url).default;
+      }
+      this.showWfContent = true;
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -102,7 +102,7 @@ export default {
     }
   },
   data() {
-    var that = this;
+    let that = this;
     return {
       showDialog: true,
       falseValue: false,
@@ -122,7 +122,7 @@ export default {
     initTableM1() {
       let that = this;
       let icolumns = [];
-      if (this.type != 99) {
+      if (this.type !== 99) {
         icolumns = [
           {
             field: 'num',

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

@@ -167,7 +167,7 @@ export default {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = this.current_prefix + (this.isEdit ? `/wf_obj_config/update` : `/wf_obj_config/save`);
+            let url = this.current_prefix + (this.isEdit ? `/wf_obj_config/update` : `/wf_obj_config/save`);
             this.$http({
               url: url,
               method: `post`,

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

@@ -148,7 +148,7 @@ export default {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/wf_obj_config/update` : `/wf_obj_config/save`);
+            let url = USER_PREFIX + (this.isEdit ? `/wf_obj_config/update` : `/wf_obj_config/save`);
             this.$http({
               url: url,
               method: `post`,
@@ -179,7 +179,7 @@ export default {
       });
     },
     initM1() {
-      var that = this;
+      let that = this;
       const tableRef = 'table-m1';
       const tableOption = {
         vue: this,

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

@@ -196,7 +196,7 @@ export default {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = this.current_prefix + (this.isEdit ? `/wf_obj_config_item/update` : `/wf_obj_config_item/save`);
+            let url = this.current_prefix + (this.isEdit ? `/wf_obj_config_item/update` : `/wf_obj_config_item/save`);
             this.$http({
               url: url,
               method: `post`,

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

@@ -115,7 +115,7 @@ export default {
       this.$refs.editForm.$baseValidate(valid => {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
-            var url = USER_PREFIX + (this.isEdit ? `/wf_obj_config_item/update` : `/wf_obj_config_item/save`);
+            let url = USER_PREFIX + (this.isEdit ? `/wf_obj_config_item/update` : `/wf_obj_config_item/save`);
             this.$http({
               url: url,
               method: `post`,

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

@@ -98,7 +98,7 @@ export default {
     this.initTableM1();
   },
   data() {
-    var that = this;
+    let that = this;
     return {
       showDialog: true,
       falseValue: false,
@@ -199,7 +199,7 @@ export default {
             width: 150
           },
           {
-            width: 230,
+            width: 238,
             fixed: 'right',
             sortable: false,
             title: '',
@@ -353,7 +353,7 @@ export default {
       this.$emit('close');
     },
     openScriptDialog(row){
-      var url = '/' + this.pRow.serviceId + '/wf_def_script/getCommon';
+      let url = '/' + this.pRow.serviceId + '/wf_def_script/getCommon';
       this.$http({
           url: url,
           method: `post`,
@@ -377,7 +377,7 @@ export default {
     },
     saveScript() {
       this.$baseConfirm(this.$t1('您确定要保存脚本吗？')).then(() => {
-        var url = '/' + this.pRow.serviceId + '/wf_def_script/save';
+        let url = '/' + this.pRow.serviceId + '/wf_def_script/save';
         this.$http({
           url: url,
           method: `post`,

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

@@ -29,7 +29,7 @@
               <template #form>
                 <div style="margin-bottom: 8px;" class="clearfix">
                   <div class="fl">
-                    <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                    <vxe-button status="primary"  type="text" plain class="button-sty" icon="el-icon-plus" @click="openEditDialog">
                       {{ $t1('新增单据') }}
                     </vxe-button>
                   </div>
@@ -64,7 +64,7 @@
               <i class="el-icon-more"></i>
             </div>
           </label>
-          <div style="height: calc(100vh - 345px - 105px);">
+          <div style="height: calc(100vh - 345px - 101px);">
             <vxe-grid ref="table-m2" v-bind="vxeOption1" @resizable-change="$vxeTableUtil.onColumnWitchChange"
                       @custom="$vxeTableUtil.customHandle">
               <template #row_edit>
@@ -212,14 +212,14 @@ export default {
   },
   watch: {
     dialogActiveName(val) {
-      if (val == 'second') {
+      if (val === 'second') {
         this.showFunctionScriptList = true;
       }
     },
     activeName(val) {
-      if (val == 'third' && !this.showParamEdit) {
+      if (val === 'third' && !this.showParamEdit) {
         this.showParamEdit = true;
-      } else if (val == 'fourth' && !this.showWfDiyAttributeEdit) {
+      } else if (val === 'fourth' && !this.showWfDiyAttributeEdit) {
         this.showWfDiyAttributeEdit = true;
       }
     }
@@ -234,7 +234,7 @@ export default {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(id, serviceId) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.serviceId = serviceId || '';
       this.activeName = 'first';
       this.showItemEdit = false;
@@ -319,9 +319,9 @@ export default {
             slots: {
               default: ({row}) => {
                 if (row.forms) {
-                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                  return [<span class="list-tag green">{this.$t1('是')}</span>];
                 } else {
-                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                  return [<span class="list-tag danger">{this.$t1('否')}</span>];
                 }
               }
             }
@@ -365,7 +365,7 @@ export default {
                     >
                       <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                   popper-class="tooltip-skin">
-                        <i class="el-icon-edit"/>
+                        <i class="el-icon-view"/>
                       </el-tooltip>
                     </a>
                   </div>
@@ -384,7 +384,7 @@ export default {
         CLASSICS: "经典模型",
         MIMIC: "仿钉钉模型",
       }
-      var that = this;
+      let that = this;
       let tableOption1 = {
         vue: that,
         tableRef: 'table-m2',
@@ -442,20 +442,20 @@ export default {
                 }
               }
             }
-          },
-          {
-            title: this.$t1('是否允许流程启动更改候选人'),
-            field: 'startSetCandidate',
-            width: 250,
-            slots: {
-              default: ({row}) => {
-                if (row.startSetCandidate) {
-                  return [<div class="txt-status">{this.$t1('是')}</div>];
-                } else {
-                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
-                }
-              }
-            }
+          },
+          {
+            title: this.$t1('是否允许流程启动更改候选人'),
+            field: 'startSetCandidate',
+            width: 250,
+            slots: {
+              default: ({row}) => {
+                if (row.startSetCandidate) {
+                  return [<span class="list-tag green">{this.$t1('是')}</span>];
+                } else {
+                  return [<span class="list-tag danger">{this.$t1('否')}</span>];
+                }
+              }
+            }
           },
           /**{
             title: this.$t1('设计器模型'),
@@ -494,7 +494,7 @@ export default {
                   >
                     <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                 popper-class="tooltip-skin">
-                      <i class="el-icon-edit"/>
+                      <i class="el-icon-view"/>
                     </el-tooltip>
                   </a>,
                   <a
@@ -691,8 +691,8 @@ export default {
       if (window.navigator.msSaveOrOpenBlob) {
         navigator.msSaveBlob(blob, filename);
       } else {
-        var link = document.createElement("a");
-        var body = document.querySelector("body");
+        let link = document.createElement("a");
+        let body = document.querySelector("body");
 
         link.href = window.URL.createObjectURL(blob);
         link.download = filename;
@@ -730,7 +730,7 @@ export default {
       this.showImportItemDialog = true;
     },
     confirmImportItemDialog(file){
-      var form = new FormData();
+      let form = new FormData();
       // 文件对象
       form.append("file", file);
       form.append("modelId", this.importXmlRow.modelId);

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

@@ -18,7 +18,7 @@
             <template #form>
               <div style="margin-bottom: 8px;" class="clearfix">
                 <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openEditDialog">
+                  <vxe-button status="primary" type="text" plain class="button-sty" icon="el-icon-plus" @click="openEditDialog">
                     {{ $t1('新增流程模板') }}
                   </vxe-button>
                 </div>
@@ -143,7 +143,7 @@ export default {
   },
   watch: {
     dialogActiveName(val) {
-      if (val == 'second') {
+      if (val === 'second') {
         this.showFunctionScriptList = true;
       }
     }
@@ -157,12 +157,12 @@ export default {
       this.$refs['table-m2'].commitProxy('reload');
     },
     openEditDialog(id) {
-      this.dataId = !id || typeof id == 'object' ? 0 : id;
+      this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.$openEditView('showItemEdit');
     },
     initTableM2() {
-      var that = this;
+      let that = this;
       let tableOption1 = {
         vue: that,
         tableRef: 'table-m2',
@@ -227,7 +227,7 @@ export default {
                   >
                     <el-tooltip enterable={false} effect="dark" content={this.$t1('查看')} placement="top"
                                 popper-class="tooltip-skin">
-                      <i class="el-icon-edit"/>
+                      <i class="el-icon-view"/>
                     </el-tooltip>
                   </a>,
                   <a