cloud-web-corejs 1.0.54-dev.500 → 1.0.54-dev.502

package/src/components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue

@@ -77,6 +77,7 @@ export default {
     },
     computedStyle() {
       let displayStyle = !this.designState && this.field.options.hidden ? "none !important":this.displayStyle
+      if(!this.designState && !this.isShow)displayStyle = "none !important";
       return {display: displayStyle, height: this.heightStyle};
     },
     isShow() {

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

@@ -20,6 +20,100 @@
               placeholder="默认saveUpdatge"
             ></el-input>
           </el-form-item>
+          <el-form-item :label="i18nt('designer.setting.globalFunctions')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editGlobalFunctions"
+            >
+              <span>{{ formConfig.functions }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('designer.setting.formCss')">
+            <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
+              {{ i18nt("designer.setting.addCss") }}
+            </el-button>
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="2" title="详情表单信息">
+          <el-form-item :label="i18nt('加载详情数据')">
+            <el-switch v-model="formConfig.isLoadEntity"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本编码')">
+            <el-input
+              type="text"
+              v-model="formConfig.formScriptCode"
+              placeholder="默认getOne"
+            ></el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本参数')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormScriptParam"
+            >
+              <span>{{ formConfig.formScriptParam }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('详情数据脚本回调')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormScriptSuccess"
+            >
+              <span>{{ formConfig.formScriptSuccess }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
+          <el-form-item :label="i18nt('查看页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.editFormCode"
+              @clear="
+                formConfig.editFormName = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(2)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('查看页面表单名称')">
+            {{ formConfig.editFormName }}
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单编码')">
+            <el-input
+              class="search-input"
+              max="200"
+              v-model="formConfig.addFormCode"
+              @clear="
+                formConfig.addFormCode = null;
+                $forceUpdate();
+              "
+              v-el-readonly
+              clearable
+              placeholder="默认使用查看表单编码"
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openFormTemplate(1)"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="i18nt('新增页面表单名称')">
+            {{ formConfig.addFormName }}
+          </el-form-item>
+        </el-collapse-item>
+        <el-collapse-item name="3" title="流程信息">
           <el-form-item :label="i18nt('启用流程')">
             <el-switch
               v-model="formConfig.wfEnabled"
@@ -33,13 +127,6 @@
                 title="流程主题说明"
                 path="static/readme/WfSubject.txt"
               ></scriptDescriptionButton>
-              <!-- <el-tooltip effect="light">
-              <i class="el-icon-info"></i>
-              <div slot="content" style="white-space: pre-wrap;">
-                {{tip1}}
-              </div>
-
-            </el-tooltip> -->
             </span>
           </el-form-item>
           <div>
@@ -110,59 +197,8 @@
               <i class="el-icon-edit"></i>
             </a>
           </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>
-          <el-form-item :label="i18nt('详情数据脚本编码')">
-            <el-input
-              type="text"
-              v-model="formConfig.formScriptCode"
-              placeholder="默认getOne"
-            ></el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('详情数据脚本参数')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editFormScriptParam"
-            >
-              <span>{{ formConfig.formScriptParam }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('详情数据脚本回调')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editFormScriptSuccess"
-            >
-              <span>{{ formConfig.formScriptSuccess }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.globalFunctions')">
-            <a
-              href="javascript:void(0);"
-              class="a-link link-oneLind"
-              @click="editGlobalFunctions"
-            >
-              <span>{{ formConfig.functions }}</span>
-              <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.formCss')">
-            <el-button type="info" icon="el-icon-edit" plain round @click="editFormCss">
-              {{ i18nt("designer.setting.addCss") }}
-            </el-button>
-          </el-form-item>
         </el-collapse-item>
-        <el-collapse-item name="2" title="列表标签页信息">
+        <el-collapse-item name="4" title="列表标签页信息">
           <el-form-item :label="i18nt('列表启用详情多标签')">
             <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
           </el-form-item>
@@ -170,7 +206,7 @@
             <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
           </el-form-item>
         </el-collapse-item>
-        <el-collapse-item name="2" title="其他标签页信息">
+        <el-collapse-item name="5" title="其他标签页信息">
           <el-form-item :label="i18nt('自定义列表标签名称')">
             <el-input
               type="text"
@@ -225,55 +261,7 @@
             </div>
           </el-form-item>
         </el-collapse-item>
-
-        <el-collapse-item name="3" title="详情表单信息">
-          <el-form-item :label="i18nt('查看页面表单编码')">
-            <el-input
-              class="search-input"
-              max="200"
-              v-model="formConfig.editFormCode"
-              @clear="
-                formConfig.editFormName = null;
-                $forceUpdate();
-              "
-              v-el-readonly
-              clearable
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-search"
-                @click="openFormTemplate(2)"
-              ></i>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('查看页面表单名称')">
-            {{ formConfig.editFormName }}
-          </el-form-item>
-          <el-form-item :label="i18nt('新增页面表单编码')">
-            <el-input
-              class="search-input"
-              max="200"
-              v-model="formConfig.addFormCode"
-              @clear="
-                formConfig.addFormCode = null;
-                $forceUpdate();
-              "
-              v-el-readonly
-              clearable
-              placeholder="默认使用查看表单编码"
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-search"
-                @click="openFormTemplate(1)"
-              ></i>
-            </el-input>
-          </el-form-item>
-          <el-form-item :label="i18nt('新增页面表单名称')">
-            {{ formConfig.addFormName }}
-          </el-form-item>
-        </el-collapse-item>
-        <el-collapse-item name="4" title="查询弹框展示信息">
+        <el-collapse-item name="6" title="查询弹框展示信息">
           <el-form-item :label="i18nt('展示字段')">
             <el-input
               class="search-input"
@@ -296,7 +284,7 @@
 
         <el-collapse-item
           v-if="showEventCollapse()"
-          name="2"
+          name="7"
           :title="i18nt('designer.setting.eventSetting')"
         >
           <!--          <el-form-item label="onBeforeCreated" label-width="150px">
@@ -838,6 +826,120 @@
       </div>
     </el-dialog>
 
+    <el-dialog
+      v-if="showWfActionTipConfigDialog"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('流程提交提醒配置')"
+      :visible.sync="showWfActionTipConfigDialog"
+      :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
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="wfActionTipConfig"
+          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="250">
+            <template slot-scope="{ row, $index }">
+              <el-input
+                class="search-input"
+                max="200"
+                v-model="row.companyCodes"
+                @clear="clearBdCompanyEnv2(row)"
+                v-el-readonly
+                clearable
+              >
+                <i
+                  slot="suffix"
+                  class="el-input__icon el-icon-search"
+                  @click="openBdCompanyEnvDialog2($index)"
+                ></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('服务名称')" width="150">
+            <template slot-scope="{ row }">
+              {{ row.serveName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('流程模板序号')" width="150">
+            <template slot-scope="{ row }">
+              <base-input-number v-model="row.modelOrders" clearable></base-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('节点步骤')" width="250">
+            <template slot-scope="{ row }">
+              <el-input v-model="row.taskStep" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('通过提示语')" width="250">
+            <template slot-scope="{ row }">
+              <el-input v-model="row.sumitTip" clearable></el-input>
+            </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="addWfActionTip"
+              ></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="wfActionTipConfig.splice(scope.$index, 1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button
+          @click="showWfActionTipConfigDialog = false"
+          class="button-sty"
+          icon="el-icon-close"
+        >
+          {{ i18nt("designer.hint.cancel") }}
+        </el-button>
+        <el-button
+          type="primary"
+          @click="confirmWfActionTipConfigDialog"
+          class="button-sty"
+          icon="el-icon-check"
+        >
+          {{ i18nt("designer.hint.confirm") }}
+        </el-button>
+      </div>
+    </el-dialog>
+
     <formTemplateDialog
       v-if="showFormTemplateDialog"
       :visiable.sync="showFormTemplateDialog"
@@ -885,7 +987,7 @@ export default {
     formTemplateDialog,
     wfObjConfigDialog,
     bdCompanyEnvDialog,
-    Draggable
+    Draggable,
   },
   props: {
     designer: Object,
@@ -896,7 +998,7 @@ export default {
     return {
       designerConfig: this.getDesignerConfig(),
 
-      formActiveCollapseNames: ["1", "2"],
+      formActiveCollapseNames: ["1", "2", "7"],
 
       formSizes: [
         { label: "default", value: "" },
@@ -943,6 +1045,9 @@ export default {
       dialogVisible2: false,
       wfAgreeConfigData: [],
 
+      showWfActionTipConfigDialog: false, //是否显示流程操作提示配置对话框
+      wfActionTipConfig: [], //流程操作提示配置
+
       showBdCompanyEnvDialog1: false,
       showBdCompanyEnvDialog2: false,
 
@@ -1376,6 +1481,63 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
         formCode: null,
       });
     },
+    //流程工作流提示配置
+    openWfActionTipConfigDialog() {
+      let tableData = this.formConfig.wfActionTipConfig || [];
+      this.showWfActionTipConfigDialog = true;
+      this.wfActionTipConfig = this.$baseLodash.cloneDeep(tableData);
+    },
+    addWfActionTip() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        modelOrders: undefined,
+        taskStep: null,
+        companyCodes: null,
+        sumitTip: null,
+      };
+      this.wfActionTipConfigData.push(newItem);
+    },
+    confirmWfActionTipConfigDialog() {
+      let tableData = this.wfActionTipConfig;
+      let map = {};
+      for (let i = 0; i < tableData.length; i++) {
+        let item = tableData[i];
+        if (!item.serveName) {
+          this.$message({
+            type: "error",
+            message: "服务名称不能为空",
+          });
+          return;
+        }
+        if (!item.companyCodes) {
+          this.$message({
+            type: "error",
+            message: "组织编码不能为空",
+          });
+          return;
+        }
+        /* let modelOrders = item.modelOrders ?? "";
+
+        let serveName = item.serveName;
+        let companyCodes = item.companyCodes;
+        let key = serveName + "_" + companyCodes + "_" + modelOrders;
+        if (!map[key]) {
+          map[key] = true;
+        } else {
+          this.$message({
+            type: "error",
+            message: "[服务+组织+流程模板序号]不能重复",
+          });
+          return;
+        } */
+      }
+
+      this.showWfActionTipConfigDialog = false;
+      this.formConfig.wfActionTipConfig = tableData;
+    },
   },
 };
 </script>