cloud-web-corejs 1.0.54-dev.95 → 1.0.54-dev.98

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

@@ -6,7 +6,7 @@
     <el-form-item :label="i18nt('有流程隐藏')">
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('特定流程节点可编辑')">
+    <el-form-item :label="i18nt('特定流程节点设置')">
       <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('流程节点信息')">
@@ -15,23 +15,32 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
-
-<!--    <el-form-item :label="i18nt('特定流程节点显隐')">
-      <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
+    <el-form-item :label="i18nt('过程更改业务数据')">
+      <el-switch v-model="optionModel.wfModifyDataEnabled"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('流程节点信息')">
-      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
-        <span>{{ optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : "" }}</span>
+    <el-form-item :label="i18nt('更改业务数据信息')">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog2">
+        <span>{{ optionModel.wfModifyDataConfig && optionModel.wfModifyDataConfig.length ? "已维护" : "" }}</span>
         <i class="el-icon-edit"></i>
       </a>
-    </el-form-item>-->
+    </el-form-item>
+
+    <!--    <el-form-item :label="i18nt('特定流程节点显隐')">
+          <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
+        </el-form-item>
+        <el-form-item :label="i18nt('流程节点信息')">
+          <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+            <span>{{ optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : "" }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>-->
     <el-dialog
       v-if="dialogVisible"
       custom-class="dialog-style list-dialog"
       :title="i18nt('流程节点信息')"
       :visible.sync="dialogVisible"
       :show-close="!0"
-      :append-to-body="false"
+      :append-to-body="true"
       :modal="false"
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
@@ -39,16 +48,18 @@
       width="1220px"
       top="5vh"
       v-dialog-drag
+      :fullscreen="true"
     >
-      <div class="cont">
+      <div class="cont" style="padding-bottom: 8px;">
         <el-table
           ref="singleTable"
           width="100%"
           :data="tableData"
-          height="500"
+          height="100%"
           border=""
           row-key="columnId"
           stripe=""
+          style="margin-bottom: 0px;"
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('服务')" width="150">
@@ -82,17 +93,25 @@
               </el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('流程模板')" width="150">
+          <el-table-column :label="i18nt('流程模板编码')" width="150">
             <template slot-scope="{row}">
               <el-input v-model="row.modelKey" clearable></el-input>
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('节点')" width="250">
+          <el-table-column :label="i18nt('节点步骤')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
           </el-table-column>
-
+          <el-table-column :label="i18nt('设置')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type" clearable>
+                <el-option :value="1" label="可编辑"></el-option>
+                <el-option :value="2" label="仅显示"></el-option>
+                <el-option :value="3" label="隐藏"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
           <!--          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
                       <template slot-scope="scope">
                         <el-select v-model="scope.row.modelId" @change="changeModelId">
@@ -140,6 +159,92 @@
         </el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      v-if="dialogVisible2"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('过程更改业务数据')"
+      :visible.sync="dialogVisible2"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="tableData2"
+          height="500px"
+          border=""
+          row-key="columnId"
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('流程动作')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.action">
+                <el-option value="start" label="流程启动"></el-option>
+                <el-option value="interrupt" label="流程中断"></el-option>
+                <el-option value="end" label="流程完成"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+<!--          <el-table-column :label="i18nt('值类型')" width="250">
+            <template slot-scope="{row}">
+              <el-select v-model="row.valueType" @change="changeValueType">
+                <el-option :value="1" label="文本"></el-option>
+                <el-option :value="2" label="数值"></el-option>
+                <el-option :value="3" label="布尔值"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>-->
+          <el-table-column :label="i18nt('设置的值')" width="650">
+            <template slot-scope="{row}">
+              <el-input v-model="row.toValue" clearable></el-input>
+<!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
+              <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
+              <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">
+                <el-radio :label="true">true</el-radio>
+                <el-radio :label="false">false</el-radio>
+              </el-radio-group>-->
+
+            </template>
+          </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="addItem2"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="tableData2.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible2 = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="colSubmit2" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
     <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
                        @confirm="confirmCompanyDialog" :multi="true" :allCompany="true" :rows="currentCompanyInfos"
                        fieldKey="companyCode"/>
@@ -169,8 +274,10 @@ export default {
 
       currentCompanyInfos: [],
       operateIndex: 0,
-      showCompanyInfoDialog: false
+      showCompanyInfoDialog: false,
 
+      dialogVisible2: false,
+      tableData2: [],
     }
   },
   computed: {
@@ -225,6 +332,7 @@ export default {
     },
     addItem() {
       let newItem = {
+        type: null,
         serveType: null,
         serveName: null,
         modelKey: null,
@@ -245,7 +353,7 @@ export default {
     changeEnabledByWf(val) {
       if (val) {
         this.optionModel.hiddenByWf = false;
-        this.optionModel.wfEdit = false;
+        // this.optionModel.wfEdit = false;
       }
     },
     changeHiddenByWf(val) {
@@ -286,6 +394,43 @@ export default {
     },
     getCompanyNames(item) {
       return item.companyInfos.map(item => item.companyName).join(',');
+    },
+
+    openDialog2() {
+      this.tableData2 = this.$baseLodash.cloneDeep(this.optionModel.wfModifyDataConfig || []);
+      this.dialogVisible2 = true;
+    },
+    addItem2() {
+      let newItem = {
+        action: 'start',
+        // valueType: 1,
+        toValue: null
+      }
+      this.tableData2.push(newItem);
+    },
+    colSubmit2() {
+      let isError = false;
+      let map = {}
+      this.tableData2.forEach(item => {
+        let count = map[item.action] || 0;
+        map[item.action] = count + 1;
+        if (map[item.action] > 1) {
+          isError = true;
+        }
+      })
+      if (isError) {
+        this.$message({
+          message: "流程动作不能重复",
+          type: 'error',
+          duration: 2000,
+        })
+        return
+      }
+      this.dialogVisible2 = !1;
+      this.$set(this.optionModel, 'wfModifyDataConfig', this.tableData2)
+    },
+    changeValueType(row) {
+      row.toValue = null;
     }
   }
 }

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -757,7 +757,8 @@ export const defaultSearchDialogConfig = {
   tableRef: null,
   tableUniqueKey: null,
   tableData: [],
-  multipleChoices: true
+  multipleChoices: true,
+  confirmCallback:null
 }
 
 export const basicFields = [
@@ -3055,14 +3056,14 @@ export const advancedFields = [
   {
     type: "project-tag",
     icon: "uploadbox",
-    // commonFlag: !0,
+    commonFlag: !0,
     formItemFlag: !0,
     tableField: null,
     options: {
       name: "",
       keyNameEnabled: !1,
       keyName: "",
-      keyNameSuffix: "",
+      // keyNameSuffix: "",
       label: "",
       submitFlag: true,
       disabled: !1,

package/src/components/xform/form-render/indexMixin.js

@@ -375,17 +375,27 @@ modules = {
         if (wfEdit) {
           let wfConfigData = widget?.options?.wfConfigData || [];
           wfConfigData.forEach(item => {
+            let type = item.type;
             let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
-            if (taskStepList.includes(taskStep)) {
+            if (type && taskStepList.includes(taskStep)) {
               let companyInfos = item.companyInfos || [];
               let companyCodes = companyInfos.map(item => item.companyCode);
               let flag1 = !item.serveName || item.serveName == bdService;
               let flag2 = !item.modelKey || item.modelKey == modelKey;
               let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
               if (flag1 && flag2 && flag3) {
-                hasModifyItem = true;
-                target.setDisabled(false);
-                target.setHidden(false);
+                if (type === 1) {
+                  //可编辑
+                  hasModifyItem = true;
+                  target.setDisabled && target.setDisabled(false);
+                  target.setHidden(false);
+                } else if (type === 2) {
+                  //仅显示
+                  target.setDisabled && target.setDisabled(true);
+                  target.setHidden(false);
+                } else if (type === 3) {
+                  target.setHidden(true);
+                }
               }
             }
 
@@ -428,6 +438,7 @@ modules = {
               objId: dataId, //单据ID
               wfCode: wfCode, //流程编码
               showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
+              formCode: formCode,
               callback: (wfParam) => {
                 this.setFormData(formData);
                 let {hasWf} = wfParam;

package/src/components/xform/utils/emitter.js

@@ -13,7 +13,7 @@ function broadcast(componentName, eventName, params) {
 
 export default {
   methods: {
-    dispatch(componentName, eventName, params, isFormSetting) {
+    dispatch(componentName, eventName, params, option) {
 
       var parent = this.$parent || this.$root;
       var name = parent.$options.componentName;
@@ -25,15 +25,15 @@ export default {
           name = parent.$options.componentName;
         }
       }
-      if (isFormSetting) {
+      /*if (isFormSetting) {
         if (window.formSettingPanelRef) {
           parent = window.formSettingPanelRef;
         }
-      }
+      }*/
 
       if (parent) {
         let data = [eventName].concat(params);
-        data.push(isFormSetting)
+        data.push(option)
         parent.$emit.apply(parent, data);
       }
     },