cloud-web-corejs 1.0.112 → 1.0.114

package/src/views/user/form/vform/out_render.vue

@@ -31,7 +31,7 @@ export default {
           data: {
             dw: dw
           },
-          isLoading: true,
+          // isLoading: true,
           success: res => {
             let token = res.objx;
             this.$store

package/src/views/user/form/vform/render.vue

@@ -5,7 +5,7 @@
                      :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
                      :formInsData.sync="formInsData"
                      v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$baseReload()"
-                     :dataId.sync="dataId" :param="param"/>
+                     :dataId.sync="dataId" :param="param" @openCopyEditTab="openCopyEditTab"/>
     </div>
   </div>
 
@@ -72,9 +72,9 @@ export default {
         url: url,
         method: `post`,
         data: data,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
@@ -112,6 +112,7 @@ export default {
         }
         n.call(this, dataId, this.formCode, toDo);
       } else {
+        this.formData = this.$attrs.formData ?? {};
         this.showRender = true;
       }
     },
@@ -135,6 +136,9 @@ export default {
           }
         })
       }
+    },
+    openCopyEditTab(formData){
+      this.$emit("openCopyEditTab",formData)
     }
   }
 };

package/src/views/user/form/view/edit.vue

@@ -1,37 +1,38 @@
-<template>
-  <vFormRender :formCode="formCode" :dataId.sync="dataId"
-               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-               @reload="$reloadHandle"></vFormRender>
-</template>
-<script>
-
-import vFormRender from "../../../../views/user/form/vform/render.vue";
-
-export default {
-  components: {vFormRender},
-  data() {
-    return {
-      formCode: null,
-      dataId: null,
-      showEdit: false,
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    init() {
-      let formCode = this.$route.query.formCode || this.$attrs.formCode;
-      let dataId = this.$route.query.dataId || this.$attrs.dataId;
-      if (dataId && formCode) {
-        this.formCode = formCode;
-        this.dataId = Number(dataId);
-        this.showEdit = true;
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <vFormRender :formCode="formCode" :dataId.sync="dataId"
+               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
+               @reload="$reloadHandle"></vFormRender>
+</template>
+<script>
+
+import vFormRender from "../../../../views/user/form/vform/render.vue";
+
+export default {
+  components: {vFormRender},
+  data() {
+    return {
+      formCode: null,
+      dataId: null,
+      showEdit: false,
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      let formCode = this.$route.query.formCode || this.$attrs.formCode;
+      let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+
+      if (dataId && formCode) {
+        this.formCode = formCode;
+        this.dataId = Number(dataId);
+        this.showEdit = true;
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/views/user/form/view/list.vue

@@ -3,9 +3,9 @@
     <template v-if="layoutType=='PC'">
       <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param"
+          <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param" :formData="formData"
                        v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="$reloadHandle"></vFormRender>
+                       @reload="reload" @openCopyEditTab="openCopyEditTab"></vFormRender>
         </el-tab-pane>
         <el-tab-pane :label="$t2('列表')" name="second">
           <div class="grid-height">
@@ -19,7 +19,7 @@
                        :closable="true">
             <vFormRender :formCode="formCode2" :dataId.sync="tab.dataId" :param="tab.param"
                          v-if="tab.showContent" :parent-target="_self"
-                         @reload="reloadTabContent"></vFormRender>
+                         @reload="(...args)=>{formData = {};reloadTabContent(...args)}" @openCopyEditTab="openCopyEditTab"></vFormRender>
           </el-tab-pane>
         </template>
       </x-tabs>
@@ -78,7 +78,8 @@ export default {
       dataId: null,
       showEditDialog: false,
       param: {},
-      multiTabLabelField:null
+      multiTabLabelField:null,
+      formData:null
     };
   },
   created() {
@@ -99,9 +100,9 @@ export default {
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
         data: {stringOne: this.formCode},
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
         success: async res => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
@@ -129,6 +130,7 @@ export default {
         this.showEdit = false;
         this.showEditDialog = true;
         this.param = param
+        this.formData = null;
         this.$openEditView('showEdit');
       }
 
@@ -142,6 +144,24 @@ export default {
         this.$openEditView('showEdit');
       });
     },
+
+    openCopyEditTab(formData) {
+      this.dataId = null
+      this.activeName = 'first';
+      this.showEdit = false;
+      this.showEditDialog = true;
+      // this.param = param
+      this.formData = formData;
+      this.$openEditView('showEdit');
+    },
+    reload(...args){
+      this.formData = {};
+      this.$reloadHandle(...args)
+    },
+    reload2(){
+      this.formData = {};
+      this.$reloadHandle(...arguments)
+    }
   }
 };
 </script>

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

@@ -100,6 +100,7 @@
                         size="small"
                         clearable
                         value-format="yyyy-MM-dd HH:mm:ss"
+                        default-time="23:59:59"
                         :picker-options="$baseEndPickerOptions(formData.startToExeTime)"
                       ></el-date-picker>
                     </template>
@@ -211,6 +212,7 @@
                           size="small"
                           clearable
                           value-format="yyyy-MM-dd HH:mm:ss"
+                          default-time="23:59:59"
                           :picker-options="$baseEndPickerOptions(formData2.startToExeTime)"
                         ></el-date-picker>
                       </template>

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

@@ -111,6 +111,27 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                {{ $t1('序号') }}
+              </th>
+              <td>
+                <el-form-item prop="orders" :rules="[{ required: false, trigger: 'blur' }]">
+                  <base-input-number autocomplete="off" v-model="wfObjConfigItem.orders" clearable/>
+                </el-form-item>
+              </td>
+            </tr>
+            <tr>
+              <th>
+                {{ $t1('流程启动不允许更改候选人') }}
+              </th>
+              <td>
+                <el-form-item prop="startNoSetCandidate" :rules="[{ required: false, trigger: 'blur' }]">
+                  <el-radio-group v-model="wfObjConfigItem.startNoSetCandidate">
+                    <el-radio :label="true">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="false">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>
@@ -195,7 +216,9 @@ export default {
         startMode: 3,
         skipSameUserTask: false,
         toNextNode: null,
-        enabled: true
+        enabled: true,
+        orders: undefined,
+        startNoSetCandidate: false
       },
       showWfObjConfigDialog: false,
       configServiceId: null,
@@ -233,6 +256,7 @@ export default {
           modalStrictly: true,
           success: res => {
             let wfObjConfigItem = res.objx || {};
+            if (wfObjConfigItem.orders === null) wfObjConfigItem.orders = undefined
             if (wfObjConfigItem.toNextNode === 1) {
               wfObjConfigItem.toRejectNode = null
             }

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

@@ -390,6 +390,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
+          {
+            title: this.$t1('序号'),
+            field: 'orders',
+            width: 150
+          },
           {
             title: this.$t1('流程模版KEY'),
             field: 'modelKey',
@@ -468,6 +473,20 @@ export default {
               }
             }
           },
+          {
+            title: this.$t1('流程启动不允许更改候选人'),
+            field: 'startNoSetCandidate',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                if (row.startNoSetCandidate) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
@@ -590,7 +609,6 @@ export default {
     },
     initWinUserDialog() {
       window.openAssignUserDialog = opts => {
-        debugger
         this.wfAssignMulti = opts.multi;
         this.wfAssignData = opts.data || [];
         this.wfAssignCallback = opts.callback;