cloud-web-corejs 1.0.115 → 1.0.117

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

@@ -205,6 +205,24 @@ export default {
       });
     },
     initTableList() {
+      let otherColumns = [];
+      let userType = this.userType
+      if(userType==1){
+
+      }else if(userType==2){
+        otherColumns.push(...[
+          {
+            field: 'signatoryName',
+            title: this.$t1('签约人'),
+            width: 150
+          },
+          {
+            field: 'signatoryMobile',
+            title: this.$t1('签约人电话'),
+            width: 150
+          },
+        ])
+      }
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -345,6 +363,7 @@ export default {
             title: this.$t1('所属组织'),
             width: 250
           },
+          ...otherColumns,
           {
             field: 'createBy',
             title: this.$t1('创建人'),

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

@@ -122,13 +122,13 @@
             </tr>
             <tr>
               <th>
-                {{ $t1('流程启动不允许更改候选人') }}
+                {{ $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 :label="false">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="true">{{ $t1('否') }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </td>

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

@@ -105,7 +105,7 @@
       <iframe :src="wfUrl" :style="'width:100%;height:' + ($root.$el.clientHeight - 30 - 12) + 'px'"></iframe>
     </el-dialog>
 
-    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser" :rows="wfAssignData" labelKey="loginAccount"
+    <userDialog v-if="showUserDialog" :visiable.sync="showUserDialog" @confirm="confirmUser"
                 :multi.sync="wfAssignMulti"/>
     <positionDialog v-if="showPositionDialog" :visiable.sync="showPositionDialog" :rows="wfAssignPositionData" @confirm="confirmPosition"/>
     <scriptDescriptionDialog path="static/readme/Wf.txt" v-if="showScriptDescriptionDialog"
@@ -474,15 +474,15 @@ export default {
             }
           },
           {
-            title: this.$t1('流程启动不允许更改候选人'),
+            title: this.$t1('是否允许流程启动更改候选人'),
             field: 'startNoSetCandidate',
-            width: 150,
+            width: 230,
             slots: {
               default: ({row}) => {
                 if (row.startNoSetCandidate) {
-                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                  return [<div class="txt-status">{this.$t1('否')}</div>];
                 } else {
-                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                  return [<div class="txt-status s-3">{this.$t1('是')}</div>];
                 }
               }
             }