人员查询功能调整

src/components/userSelectButton/UserSelectDialog.vue

@@ -324,7 +324,7 @@
         }
         this.loading = true
         this.$http({
-          url: '/system-server/sys/user/list2',
+          url: '/system-server/sys/user/list',
           method: 'get',
           params: {
             'current': this.pageNo,

src/views/common/UpLoadComponent.vue

@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column label="操作" width="200px" fixed="right" align="center">
           <template  #default="scope">
-            <el-button text type="primary" key="01" icon="el-icon-download" size="small" @click="toHref(scope.row)" :disabled="false">下载</el-button>
+            <el-button text type="primary" key="01" icon="el-icon-download" size="small" @click="toHref(scope.row)" >下载</el-button>
             <el-button text type="primary" key="02" icon="el-icon-delete" size="small"  @click="deleteById(scope.row, scope.$index)" :disabled="auth==='view'&&delFlag === false&&createBy!==scope.row.createBy.name">删除</el-button>
 <!--            <el-button v-if="createBy===scope.row.createBy.name" type="text"  icon="el-icon-delete" size="small"  @click="deleteById(scope.row, scope.$index)" :disabled="auth==='view'&&delFlag === false">删除2</el-button>-->
           </template>

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedList.vue

@@ -338,7 +338,7 @@
             this.procDefAuditKey = data.key
           }
         })
-		  this.processService.getByName('会计-报告作废归档-苏州').then(({data}) => {
+		  processService.getByName('会计-报告作废归档-苏州').then((data) => {
 			  if (!this.commonJS.isEmpty(data.id)) {
 				  this.processDefinitionAuditIdSZ = data.id
 				  this.procDefAuditKeySZ = data.key

src/views/cw/reportCancellApplyArchived/ReportCancellApplyArchivedTaskForm.vue

@@ -139,6 +139,7 @@
               <el-col :span="12">
                 <el-form-item label="案卷号" prop="number"
                               :rules="[
+                              	{required: true, message:'案卷号不能为空', trigger:'blur'}
                    ]">
                   <el-input :disabled="false" v-model="inputForm.number" placeholder="请填写案卷号" clearable></el-input>
                 </el-form-item>
@@ -146,6 +147,7 @@
               <el-col :span="12">
                 <el-form-item label="确认案卷号" prop="isNumber"
                               :rules="[
+                              	{required: true, message:'确认案卷号不能为空', trigger:'blur'}
                    ]">
                   <el-input :disabled="false" v-model="inputForm.isNumber" placeholder="请填写确认案卷号" clearable></el-input>
                 </el-form-item>

src/views/cw/reportManagement/reportReview/ReportReviewForm.vue

@@ -98,7 +98,7 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect2>
               </el-form-item>
             </el-col>
 
@@ -116,7 +116,7 @@
                             :rules="[
                    ]">
                 <!--                <el-input v-model="inputForm.signatureAnnotator2" placeholder="请填写签字注师2" clearable></el-input>-->
-                <UserSelect style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect>
+                <UserSelect2 style="width: 100%" ref="userSelect2" :disabled="status === 'audit' || status === 'taskFormDetail'" :readonly="true" :limit='1' :modelValue="inputForm.signatureAnnotator2" @getValue='(value) => {changeSignatory2(value)}'></UserSelect2>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -641,7 +641,8 @@
   import UpLoadComponent from '@/views/common/UpLoadComponent'
   // import UpLoadComponent from '@/views/common/UpLoadComponentV2.1'
   import SelectTree from '@/components/treeSelect/treeSelect.vue'
-  import UserSelect from '../../workClientInfo/clientUserSelect'
+  import UserSelect from '../../workClientInfo/clientUserSelect/AccountantUserIndex'
+  import UserSelect2 from '../../workClientInfo/clientUserSelect/AccountantUserIndex2'
   import UserSelectAll from '@/components/userSelect'
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import ReportReviewService from '@/api/cw/reportManagement/ReportReviewService'
@@ -790,6 +791,7 @@
       UpLoadComponent,
       SelectTree,
       UserSelect,
+	  UserSelect2,
       UserSelectAll
       // ReportCancellApplyChooseCom
     },

src/views/cw/workClientInfo/clientUserSelect/AccountantUserSelectDialog.vue

@@ -378,7 +378,7 @@
       },
       refreshTree () {
         this.$http({
-          url: `/system-server/sys/office/accessTreeData`,
+          url: `/system-server/sys/office/treeDataByUser`,
           method: 'get'
         }).then((data) => {
           this.officeTreeData = data

src/views/cw/workClientInfo/clientUserSelect/UserSelectDialog.vue

@@ -359,7 +359,7 @@
       },
       refreshTree () {
         this.$http({
-          url: `/system-server/sys/office/qzTreeData`,
+          url: `/system-server/sys/office/treeDataByUser`,
           method: 'get'
         }).then((data) => {
           this.officeTreeData = data

src/views/cw/workContract/ContractFilePaperForm.vue

@@ -218,13 +218,18 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
+        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
           <el-form-item label="合同实际金额" prop="actualContractAmount"
                         :rules="[{required: true, message: '请填写合同实际金额', trigger: 'blur'}
                  ]">
             <el-input maxlength="64" @blur="testSout" v-model="inputForm.actualContractAmount" ></el-input>
           </el-form-item>
         </el-col>
+		  <el-col :span="12" v-else>
+			  <el-form-item label="合同实际金额" prop="actualContractAmount">
+				  <el-input maxlength="64" @blur="testSout" v-model="inputForm.actualContractAmount" ></el-input>
+			  </el-form-item>
+		  </el-col>
 
         <el-col :span="12">
           <el-form-item label="对方合同编号" prop="contractOpposite">

src/views/program/registered/ProjectArchiveForm.vue

@@ -2,7 +2,7 @@
   <div>
 
     <div>
-      <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail' || method === 'view'"
+      <el-form size="large" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'"
                label-width="170px" @submit.native.prevent>
         <el-divider content-position="left"><i class="el-icon-document"></i> 项目归档</el-divider>
           <el-row  :gutter="15">
@@ -474,21 +474,21 @@
               </el-form-item>
             </el-col>-->
           </el-row>
-          <!--附件信息 - 开票文件-->
-          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
-          <!--附件信息 - 评估报告-->
-          <UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>
-          <!--附件信息 - 评估说明-->
-          <UpLoadComponent ref="uploadComponentExplain"></UpLoadComponent>
-          <!--附件信息 - 评估明细表-->
-<!--          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>-->
-          <!--附件信息 - 评估操作计算底稿-->
-          <UpLoadComponent ref="uploadComponentPapers"></UpLoadComponent>
-          <!--附件信息 - 其他-->
-          <UpLoadComponent ref="uploadComponentOther"></UpLoadComponent>
 
 
       </el-form>
+		<!--附件信息 - 开票文件-->
+		<UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>
+		<!--附件信息 - 评估报告-->
+		<UpLoadComponent ref="uploadComponentReport"></UpLoadComponent>
+		<!--附件信息 - 评估说明-->
+		<UpLoadComponent ref="uploadComponentExplain"></UpLoadComponent>
+		<!--附件信息 - 评估明细表-->
+		<!--          <UpLoadComponent ref="uploadComponentDetail"></UpLoadComponent>-->
+		<!--附件信息 - 评估操作计算底稿-->
+		<UpLoadComponent ref="uploadComponentPapers"></UpLoadComponent>
+		<!--附件信息 - 其他-->
+		<UpLoadComponent ref="uploadComponentOther"></UpLoadComponent>
 
     </div>