cloud-web-corejs 1.0.54-dev.1 → 1.0.54-dev.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.1",
+  "version": "1.0.54-dev.3",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -13,6 +13,12 @@
           <el-form-item :label="i18nt('启用流程')">
             <el-switch v-model="formConfig.wfEnabled"></el-switch>
           </el-form-item>
+          <el-form-item label="流程单据定义">
+            <a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfObjConfigDialog">
+              <span>{{ wfObjConfigs.length ? '已维护' : null}}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <el-form-item :label="i18nt('加载详情数据')">
             <el-switch v-model="formConfig.isLoadEntity"></el-switch>
           </el-form-item>
@@ -290,6 +296,8 @@
 
     <formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
                         @confirm="confirmFormTemplate" multi="false"/>
+    <wfObjConfigDialog v-if="showWfObjConfigDialog" :visiable.sync="showWfObjConfigDialog"
+                       @confirm="confirmWfObjConfigDialog" :formTemplate="designer.vueInstance.reportTemplate"/>
   </div>
 </template>
 
@@ -297,12 +305,15 @@
 import i18n from '../../../../components/xform/utils/i18n';
 import {deepClone, insertCustomCssToHead, insertGlobalFunctionsToHtml} from '../../../../components/xform/utils/util';
 import formTemplateDialog from '../../../../views/bd/setting/form_template/dialog.vue'
+import wfObjConfigDialog from "./wfObjConfigDialog.vue";
+
 
 export default {
   name: 'form-setting',
   mixins: [i18n],
   components: {
-    formTemplateDialog
+    formTemplateDialog,
+    wfObjConfigDialog
   },
   props: {
     designer: Object,
@@ -348,7 +359,9 @@ export default {
       formScriptParam:null,
       showFormScriptParamDialog: false,
       formScriptSuccess:null,
-      showFormScriptSuccessDialog: false
+      showFormScriptSuccessDialog: false,
+      wfObjConfigs:[],
+      showWfObjConfigDialog:false
     };
   },
   created() {
@@ -369,6 +382,7 @@ export default {
       this.extractCssClass();
       this.designer.emitEvent('form-css-updated', deepClone(this.cssClassList));
     }, 1200);
+    this.getListByObjTypeCode();
   },
   methods: {
     showEventCollapse() {
@@ -545,6 +559,26 @@ export default {
       this.designer.formConfig.formScriptSuccess = this.formScriptSuccess;
       this.showFormScriptSuccessDialog = false;
     },
+    openWfObjConfigDialog(){
+      this.showWfObjConfigDialog = true;
+    },
+    confirmWfObjConfigDialog(rows){
+      this.wfObjConfigs = rows || [];
+    },
+    getListByObjTypeCode(){
+      let reportTemplate = this.designer.vueInstance.reportTemplate
+      this.$http({
+        url: `/${reportTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
+        method: `post`,
+        data:{
+          stringOne:reportTemplate.objTypeCode
+        },
+        isLoading: true,
+        success: res => {
+          this.wfObjConfigs = res.objx || [];
+        }
+      });
+    },
   }
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/showRuleFlag-editor.vue

@@ -43,7 +43,7 @@
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('匹配规则')" width="250" prop="label">
             <template slot-scope="scope">
-              <el-select v-model="scope.row.ruleType">
+              <el-select v-model="scope.row.ruleType" @change="changeRuleType(scope.row)">
                 <el-option :value="1" label="用户"></el-option>
                 <el-option :value="2" label="机构"></el-option>
                 <el-option :value="3" label="角色"></el-option>
@@ -52,7 +52,19 @@
           </el-table-column>
           <el-table-column :label="i18nt('值')" width="300" prop="prop">
             <template slot-scope="scope">
-              <el-input v-model="scope.row.value"></el-input>
+              <el-input
+                class="search-input"
+                :value="getRowValueName(scope.row)"
+                clearable
+                @clear="
+                  scope.row.value = [];
+                "
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search"
+                   @click="openRowValueDialog(scope.row, scope.$index )"></i>
+              </el-input>
+
             </template>
           </el-table-column>
           <el-table-column :label="i18nt('是否可见')" width="150" prop="prop">
@@ -89,14 +101,29 @@
         </el-button>
       </div>
     </el-dialog>
+    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUserDialog"
+                multi="true" :rows="operateRows"/>
+    <saleOrgDialog v-if="showSaleOrgDialog" :visiable.sync="showSaleOrgDialog" @confirm="confirmSaleOrgDialog"
+                   multi="true" :rows="operateRows"/>
+    <roleDialog v-if="showRoleDialog" :visiable.sync="showRoleDialog" @confirm="confirmRoleDialog"
+                multi="true" :rows="operateRows"/>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n"
+import userDialog from "@base/views/user/user/dialog.vue";
+import saleOrgDialog from "@base/views/user/sale_org/dialog.vue";
+import roleDialog from "@base/views/user/role/dialog.vue";
+
 
 export default {
   name: "showRuleFlag-editor",
+  components: {
+    userDialog,
+    saleOrgDialog,
+    roleDialog
+  },
   mixins: [i18n],
   props: {
     designer: Object,
@@ -109,7 +136,12 @@ export default {
       dialogVisible: false,
       tableData: [],
       wfDefItems: [],
-      wfNodeMap: {}
+      wfNodeMap: {},
+      showUserDialog: false,
+      showSaleOrgDialog: false,
+      showRoleDialog: false,
+      operateRows: [],
+      operateIndex: 0
     }
   },
   computed: {
@@ -129,14 +161,59 @@ export default {
     addItem() {
       this.tableData.push({
         ruleType: 1,
-        value: null,
+        value: [],
         show: true
       });
     },
     colSubmit() {
       this.dialogVisible = !1;
       this.optionModel.showRules = this.tableData;
-    }
+    },
+    changeRuleType(row) {
+      row.value = [];
+    },
+    getRowValueName(row) {
+      let ruleType = row.ruleType;
+      let nameField = null;
+      if (ruleType == 1) {
+        nameField = 'nickName';
+      } else if (ruleType == 2) {
+        nameField = 'name';
+      } else if (ruleType == 3) {
+        nameField = 'name';
+      }
+      let rows = row.value || []
+      return rows.map(item => {
+        return item[nameField];
+      }).join(',');
+    },
+    openRowValueDialog(row, rowIndex) {
+      let ruleType = row.ruleType;
+      this.operateIndex = rowIndex;
+      this.operateRows = this.$baseLodash.cloneDeep(row.value || []);
+      if (ruleType == 1) {
+        this.showUserDialog = true;
+      } else if (ruleType == 2) {
+        this.showSaleOrgDialog = true;
+      } else if (ruleType == 3) {
+        this.showRoleDialog = true;
+      }
+    },
+    confirmUserDialog(rows) {
+      let item = this.tableData[this.operateIndex]
+      item.value.length = 0;
+      item.value.push(...rows)
+    },
+    confirmSaleOrgDialog(rows) {
+      let item = this.tableData[this.operateIndex]
+      item.value.length = 0;
+      item.value.push(...rows)
+    },
+    confirmRoleDialog(rows) {
+      let item = this.tableData[this.operateIndex]
+      item.value.length = 0;
+      item.value.push(...rows)
+    },
   }
 }
 </script>

package/src/components/xform/form-designer/setting-panel/wfObjConfigDialog.vue

@@ -0,0 +1,189 @@
+<template>
+  <el-dialog
+    custom-class="dialog-style list-dialog"
+    title="流程单据定义"
+    :visible.sync="dialogVisible"
+    :show-close="!0"
+    :append-to-body="false"
+    :modal="false"
+    :close-on-click-modal="!1"
+    :close-on-press-escape="!1"
+    :destroy-on-close="!0"
+    width="1220px"
+    top="5vh"
+    v-dialog-drag
+    @close="closeDialog"
+  >
+    <div class="cont">
+      <el-form ref="editForm" :model="formData">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="formData.wfObjConfigDTOs"
+          height="500"
+          border=""
+          row-key="columnId"
+          stripe=""
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('表单类型名称')" width="150" prop="objTypeName">
+            <template slot-scope="scope">
+              <el-form-item :prop="'wfObjConfigDTOs.'+scope.$index+'.objTypeName'"
+                            :rules="[{ required: true, trigger: 'blur' }]">
+                <el-input v-model="scope.row.objTypeName"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织名称')" width="150" prop="companyCode">
+            <template slot-scope="scope">
+              {{ scope.row.companyName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('表单类型编码')" width="200" prop="objTypeCode"></el-table-column>
+          <el-table-column :label="i18nt('服务名')" width="150" prop="serviceId"></el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="openCompanyDialog"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="formData.wfObjConfigDTOs.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-form>
+    </div>
+    <div class="dialog-footer" slot="footer">
+      <el-button @click="closeDialog" class="button-sty" icon="el-icon-close">
+        {{ i18nt('designer.hint.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="saveData" class="button-sty" icon="el-icon-check">
+        {{ i18nt('designer.hint.confirm') }}
+      </el-button>
+    </div>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       @confirm="confirmCompanyDialog" multi="false"/>
+  </el-dialog>
+</template>
+<script>
+import i18n from '../../../../components/xform/utils/i18n';
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+
+export default {
+  components: {companyInfoDialog},
+  props: ['formTemplate'],
+  mixins: [i18n],
+  data() {
+    return {
+      dialogVisible: true,
+      formData: {
+        objTypeCode: null,
+        wfObjConfigDTOs: []
+      },
+      operateIndex: 0,
+      showCompanyInfoDialog: false
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.formData.objTypeCode = this.formTemplate.objTypeCode;
+    this.getListByObjTypeCode();
+  },
+  methods: {
+    getListByObjTypeCode(callback) {
+      let formTemplate = this.formTemplate
+      this.$http({
+        url: `/${formTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
+        method: `post`,
+        data: {
+          stringOne: formTemplate.objTypeCode
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || [];
+          this.formData.wfObjConfigDTOs = rows;
+          callback && callback(rows)
+        }
+      });
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = `/${this.formTemplate.serviceName}/wf_obj_config/saveUpdates`;
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.formData,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getListByObjTypeCode(rows => {
+                  this.$emit('confirm', rows)
+                  this.closeDialog();
+                })
+              }
+            });
+          });
+        }
+      });
+    },
+    addItem() {
+      let formTemplate = this.formTemplate;
+      let row = {
+        objTypeCode: formTemplate.objTypeCode,
+        objTypeName: formTemplate.objTypeName,
+        serviceId: formTemplate.serviceName,
+        url: "form",
+        companyCode: null,
+        companyName: null
+      }
+      this.formData.wfObjConfigDTOs.push(row);
+    },
+    closeDialog() {
+      this.dialogVisible = false;
+      this.$emit("update:visiable", false);
+    },
+    openCompanyDialog() {
+      this.showCompanyInfoDialog = true;
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        let formTemplate = this.formTemplate;
+        if (!this.formData.wfObjConfigDTOs.find(item => item.companyCode == row.companyCode)) {
+          let newrow = {
+            objTypeCode: formTemplate.objTypeCode,
+            objTypeName: formTemplate.formName,
+            serviceId: formTemplate.serviceName,
+            url: "form",
+            companyCode: row.companyCode,
+            companyName: row.companyName
+          }
+          this.formData.wfObjConfigDTOs.push(newrow);
+        }
+      }
+    }
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>