cloud-web-corejs 1.0.54-dev.316 → 1.0.54-dev.318

package/package.json

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

package/src/components/baseInputExport/mixins.js

@@ -158,13 +158,11 @@ modules = {
 
 
       let condition = null;
-      debugger
       if(this.option.customCondition){
         let condition1 = this.option.customCondition(item);
         if(condition1)condition = condition1;
       }
       if(!condition){
-        debugger
         if ($grid) {
           checkRows = $grid.getCheckboxRecords(true);
         } else {

package/src/components/wf/{add0pinionButton.vue → addOpinionButton.vue}

@@ -18,7 +18,7 @@
               wfInfo.taskName
             }}</b></span>
         </template>
-        <el-form :model="formData">
+        <el-form ref="form" :model="formData">
           <div id="containt">
             <table class="table-detail">
               <tbody>
@@ -54,9 +54,11 @@
 <script>
 export default {
     props: {
-        taskId: String
+        wfSendTaskId: String,
+        wfInfo: Object, 
+        current_prefix:String
     },
-    inject: ['wfInfo', 'getCurrentPrefix'],
+    inject:['getEditVueTarget'],
     data() {
         return {
             formData: {
@@ -72,13 +74,13 @@ export default {
         confirmDialog(){
           this.$refs.form.$baseValidate((valid) => {
             if (valid) {
-              let that = getTarget(this);
-              let taskId = this.taskId;
+              let that = this.getEditVueTarget();
+              let taskId = this.wfSendTaskId;
               let formData = {
                 opinion: this.formData.opinion,
                 taskId: taskId
               }
-              return this.$http({
+              return that.$http({
                 url: this.current_prefix + "/wf/addOpinion",
                 method: `post`,
                 data: formData,
@@ -86,7 +88,7 @@ export default {
                 modalStrictly: true,
                 success: (res) => {
                   that.$message({
-                    message: resultMsg.content,
+                    message: res.content,
                     type: "success",
                     duration: 1000,
                   });

package/src/components/wf/content.vue

@@ -38,7 +38,7 @@
                    v-show="wfInfo.toRevoke"
                    icon="el-icon-document-delete">{{ $t2('撤回', 'components.wf.revoke') }}
         </el-button>
-        <add0pinionButton v-if="!!getViewParam('wfSendTaskId')" @confirm="reloadContent()"></add0pinionButton>
+        <addOpinionButton v-if="showAddOpinionButton" @confirm="reloadContent()" :wfInfo="wfInfo" :wfSendTaskId="wfSendTaskId" :current_prefix="current_prefix"></addOpinionButton>
       </div>
       <div class="title-name">
         <b>
@@ -805,7 +805,7 @@ export default {
     addTaskUserdialog: () => import('./addTaskUserdialog'),
     setCandidateDialog: () => import('./setCandidateDialog'),
     setCandidateButton: () => import('./setCandidateButton'),
-    add0pinionButton: () => import('./add0pinionButton'),
+    addOpinionButton: () => import('./addOpinionButton'),
   },
   mixins: [wfContentMixin]
 };

package/src/components/wf/wf.js

@@ -379,6 +379,11 @@ wfContentMixin = {
       showCandidate: false,
       candidateOption:{},
       candidateDatas:[],
+      wfSendTaskId: null,
+      showAddOpinionButton: false,
+
+      addOpinionEnabled: false,
+      modifyCurrentCandidateEnabled: false,
     };
   },
   provide() {
@@ -399,12 +404,42 @@ wfContentMixin = {
     this.initForAll();
   },
   methods: {
+    initWfParam13(){
+      //初始化补充意见权限
+      let that = getTarget(this);
+      return that.$http({
+        url: USER_PREFIX + "/wf_diy_attribute/getValue",
+        method: `post`,
+        data: {attributeKey: "param13"},
+        success: (res) => {
+          this.addOpinionEnabled = res?.objx === true;
+          if(this.addOpinionEnabled){
+            this.wfSendTaskId = this.getViewParam('wfSendTaskId');
+            this.showAddOpinionButton = !!this.wfSendTaskId;
+          }
+        },
+      });
+    },
+    
+    initWfParam14(){
+      //初始化修改当前候选人权限
+      let that = getTarget(this);
+      return that.$http({
+        url: USER_PREFIX + "/wf_diy_attribute/getValue",
+        method: `post`,
+        data: {attributeKey: "param14"},
+        success: (res) => {
+          this.modifyCurrentCandidateEnabled = res?.objx === true;
+        },
+      });
+    },
     getViewParam(key){
       let that = this.viewTarget;
       let value = that[key] || that.$attrs[key];
       return value;
     },
     initCandidate(){
+      // 是否显示"节点候选人"选项卡
       let that = getTarget(this);
       that.$http({
         url: USER_PREFIX + "/wf_diy_attribute/getValue",
@@ -499,9 +534,17 @@ wfContentMixin = {
           this.initWfUserParam();
           this.initTabIndex();
           this.initShowTaskInfo();
+          //初始化附言
           this.getIsShowWfMemo();
+          // 是否显示"节点候选人"选项卡
           this.initCandidate()
-          // this.initWfMemo();
+
+          //初始化补充意见权限
+          this.initWfParam13();
+
+          //初始化修改当前候选人权限
+          this.initWfParam14();
+          
         }
       });
     },

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-button-editor.vue

@@ -6,13 +6,13 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.printTableRef"></el-input>
     </el-form-item>
-    <el-form-item label="打印自定义条件参数">
+    <!-- <el-form-item label="打印自定义条件参数">
       <a href="javascript:void(0);" class="a-link link-oneLind"
          @click="editEventHandler('printCustomCondition', printConditionParams)">
         <span>{{ optionModel.printCustomCondition }}</span>
         <i class="el-icon-edit"></i>
       </a>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="输出模板编码"></el-form-item>
     <el-form-item label-width="0">
       <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
@@ -54,7 +54,7 @@ export default {
   data() {
     return {
       eventParams: [],
-      printConditionParams: ["dataId", "formCode", exportTemplate]
+      printConditionParams: ["dataId", "formCode", "exportTemplate"]
     };
   },
   methods: {

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-detail-button-editor.vue

@@ -51,7 +51,7 @@ export default {
   data() {
     return {
       eventParams: [],
-      printConditionParams: ["dataId", "formCode", exportTemplate]
+      printConditionParams: ["dataId", "formCode", "exportTemplate"]
     };
   },
   methods: {