代码提交

src/api/sys/OSSService.js

@@ -77,7 +77,7 @@ export const client = new OSS({
   accessKeySecret: '84dDIx4edT1n78KUOqqSmDZ35pchJv', // 通过阿里云控制台创建的AccessKey Secret。
 	bucket: 'xgxm-test', // 仓库名字
 	// bucket: 'xg-pg', // 仓库名字
-  useFetch: true, // 支持上传大于100KB的文件
+	useFetch: true, // 支持上传大于100KB的文件
   secure: false // 返回的url为https
 })
 

src/views/cw/invoice/InvoiceFormTask.vue

@@ -296,10 +296,10 @@
           </el-form-item>
         </el-col >
 		  <el-col :span="12" v-if="(this.commonJS.isNotEmpty(this.bj1)) && status === 'audit'">
-			  <el-form-item label="报备类型" prop="reportType"
+			  <el-form-item label="项目类别" prop="reportType"
 							:rules="[]"
 			  >
-				  <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+				  <el-select v-model="inputForm.reportType" placeholder="请选择项目类别" clearable style="width: 100%;">
 					  <el-option
 						  v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
 						  :key="item.value"
@@ -310,10 +310,10 @@
 			  </el-form-item>
 		  </el-col>
 		  <el-col :span="12" v-if="(this.commonJS.isNotEmpty(this.bj1)) && status !== 'audit'">
-			  <el-form-item label="报备类型" prop="reportType"
-							:rules="[{required: true, message:'报备类型不能为空', trigger:'blur'}]"
+			  <el-form-item label="项目类别" prop="reportType"
+							:rules="[{required: true, message:'项目类别不能为空', trigger:'blur'}]"
 			  >
-				  <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+				  <el-select v-model="inputForm.reportType" placeholder="请选择项目类别" clearable style="width: 100%;">
 					  <el-option
 						  v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
 						  :key="item.value"
@@ -349,43 +349,6 @@
 			  </el-form-item>
 		  </el-col>
 
-		  <el-form v-if="status === 'audit' || status === 'taskFormDetail'" :disabled="status === 'taskFormDetail'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
-				   label-width="160px" @submit.native.prevent>
-			  <el-row :gutter="15">
-			  <el-col :span="12" >
-				  <el-form-item label="开票时间" prop="billingDate"
-								:rules="[
-                         {required: true, message:'开票时间不能为空', trigger:'blur'}
-                 ]">
-					  <el-date-picker
-						  v-model="inputForm.billingDate"
-						  type="date"
-						  value-format="YYYY-MM-DD"
-						  placeholder="选择开票时间"
-						  style="width:100%"
-						  placement="bottom-start"
-						  clearable>
-					  </el-date-picker>
-				  </el-form-item>
-			  </el-col>
-			  <el-col :span="12">
-				  <el-form-item label="领票时间" prop="collectDate"
-								:rules="[
-                 ]">
-					  <el-date-picker
-						  v-model="inputForm.collectDate"
-						  type="date"
-						  value-format="YYYY-MM-DD"
-						  placeholder="选择领票时间"
-						  style="width:100%"
-						  placement="bottom-start"
-						  clearable>
-					  </el-date-picker>
-				  </el-form-item>
-			  </el-col>
-		  	</el-row>
-		  </el-form>
-
         <el-col :span="12">
 			<el-col v-if="status === 'audit'?true:false">
 				<el-form-item label="实际开票人" prop="billingPeopleReal"
@@ -518,6 +481,44 @@
       </el-row>
 
 
+		<el-form v-if="status === 'audit' || status === 'taskFormDetail'" :disabled="status === 'taskFormDetail'" style="width: 100%" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
+				 label-width="160px" @submit.native.prevent>
+			<el-row :gutter="15">
+				<el-col :span="12" >
+					<el-form-item label="开票时间" prop="billingDate"
+								  :rules="[
+                         {required: true, message:'开票时间不能为空', trigger:'blur'}
+                 ]">
+						<el-date-picker
+							v-model="inputForm.billingDate"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="选择开票时间"
+							style="width:100%"
+							placement="bottom-start"
+							clearable>
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12">
+					<el-form-item label="领票时间" prop="collectDate"
+								  :rules="[
+                 ]">
+						<el-date-picker
+							v-model="inputForm.collectDate"
+							type="date"
+							value-format="YYYY-MM-DD"
+							placeholder="选择领票时间"
+							style="width:100%"
+							placement="bottom-start"
+							clearable>
+						</el-date-picker>
+					</el-form-item>
+				</el-col>
+			</el-row>
+		</el-form>
+
+
       <el-form :disabled="status === 'audit'?false:true">
         <el-divider content-position="left"><i class="el-icon-document"></i>
           发票明细

src/views/cw/invoice/InvoiceList.vue

@@ -528,13 +528,13 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        processService.getByName('会计-发票申请').then((data) => {
+        processService.getByName('发票申请').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
           }
         })
-        processService.getByName('会计-发票作废').then((data) => {
+        processService.getByName('发票作废').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionInvalidId = data.id
             this.procDefInvalidKey = data.key
@@ -596,8 +596,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【会计-发票申请】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-发票申请]`
+        let tabTitle = `发起流程【发票申请】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [发票申请]`
         taskService.getTaskDef({ procDefId: this.processDefinitionId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -621,8 +621,8 @@
       // 发起发票申请审批
       invoicePush (row) {
         // 读取流程表单
-        let title = `发起流程【会计-发票申请】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[会计-发票申请]`
+        let title = `发起流程【发票申请】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了[发票申请]`
         let status = 'startAndHold'
         if (row.status === '3') {
           status = 'startAndClose'
@@ -700,8 +700,8 @@
                   ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                   isShow: 'false',
                   readOnly: true,
-                  title: '会计-发票申请' + '流程详情',
-                  formTitle: '会计-发票申请' + '流程详情',
+                  title: '发票申请' + '流程详情',
+                  formTitle: '发票申请' + '流程详情',
                   businessId: row.id,
                   status: 'reback'
                 }

src/views/cw/projectRecords/ProjectRecordsAddForm.vue

@@ -153,11 +153,11 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="报备类型" prop="reportType"
+                  <el-form-item label="项目类别" prop="reportType"
                                 :rules="[
-                                 {required: true, message:'报备类型不能为空', trigger:'blur'}
+                                 {required: true, message:'项目类别不能为空', trigger:'blur'}
                   ]">
-                    <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+                    <el-select v-model="inputForm.reportType" placeholder="请选择项目类别" clearable style="width: 100%;">
                       <el-option
                         v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
                         :key="item.value"
@@ -167,22 +167,22 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!--<el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[
-                                	{required: true, message:'项目规模不能为空', trigger:'blur'}
+                                	{required: true, message:'审计期间不能为空', trigger:'blur'}
                    ]">
                     <el-date-picker
                       v-model="inputForm.auditYear"
                       type="year"
                       value-format="YYYY"
-                      placeholder="选择评审计期间"
+                      placeholder="选择审计期间"
                       style="width:100%"
                       placement="bottom-start"
                       clearable>
                     </el-date-picker>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="12">
                   <el-form-item label="项目预计时间" prop="planDate"
                                 :rules="[
@@ -412,7 +412,7 @@
   import ContractNameForm from '../workContract/ContractNameForm'
   import workClientService from '@/api/cw/workClientInfo/WorkClientService'
   import contractInfoService from '@/api/cw/workContract/ContractInfoService'
-  import UserSelectSignatory from '../workClientInfo/clientUserSelect'
+  import UserSelectSignatory from '@/components/userSelect'
   import CwProjectBusinessTypeService from '@/api/cw/projectBusinessType/CwProjectBusinessTypeService'
   export default {
     props: {

src/views/cw/projectRecords/ProjectRecordsForm.vue

@@ -156,11 +156,11 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="报备类型" prop="reportType"
+                  <el-form-item label="项目类别" prop="reportType"
                                 :rules="[
-                                 {required: true, message:'报备类型不能为空', trigger:'blur'}
+                                 {required: true, message:'项目类别不能为空', trigger:'blur'}
                   ]">
-                    <el-select v-model="inputForm.reportType" placeholder="请选择报备类型" clearable style="width: 100%;">
+                    <el-select v-model="inputForm.reportType" placeholder="请选择项目类别" clearable style="width: 100%;">
                       <el-option
                         v-for="item in $dictUtils.getDictList('cw_work_client_report_type')"
                         :key="item.value"
@@ -170,7 +170,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="12">
+                <!--<el-col :span="12">
                   <el-form-item label="审计期间" prop="auditYear"
                                 :rules="[
                    ]">
@@ -184,7 +184,7 @@
                     >
                     </el-date-picker>
                   </el-form-item>
-                </el-col>
+                </el-col>-->
                 <el-col :span="12">
                   <el-form-item label="项目预计时间" prop="planDate"
                                 :rules="[

src/views/cw/projectRecords/ProjectRecordsList.vue

@@ -10,11 +10,11 @@
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理1" prop="projectMasterName">
 <!--        <el-input v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect>
+        <UserSelect2 :limit='1' :modelValue="searchForm.projectMasterName" @update:modelValue='(value, label) => {searchForm.projectMasterName = value}'></UserSelect2>
       </el-form-item>
       <el-form-item v-if="showHideItem" label="项目经理2" prop="realHeaderName">
         <!--        <el-input v-model="searchForm.projectMasterName" placeholder="请输入项目经理" clearable></el-input>-->
-        <UserSelect :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect>
+        <UserSelect2 :limit='1' :modelValue="searchForm.realHeaderName" @update:modelValue='(value, label) => {searchForm.realHeaderName = value}'></UserSelect2>
       </el-form-item>
 		<el-form-item v-if="showHideItem" label="创建人" prop="createBy.name">
 			<!--        <el-input  v-model="searchForm.createBy.name" placeholder="请输入创建人" clearable></el-input>-->

src/views/cw/reimbursementApproval/info/InfoList.vue

@@ -336,8 +336,8 @@
       // 新增
       add () {
         // 读取流程表单
-        let tabTitle = `发起流程【会计-报销审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
+        let tabTitle = `发起流程【报销审批】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [报销审批]`
         taskService.getTaskDef({ procDefId: this.processDefinitionId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -372,8 +372,8 @@
           status = 'reapplyFlag'
         }
         // 读取流程表单
-        let tabTitle = `发起流程【会计-报销审批】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-报销审批]`
+        let tabTitle = `发起流程【报销审批】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [报销审批]`
         taskService.getTaskDef({ procDefId: this.processDefinitionId,
           businessId: row.id,
           businessTable: 'cw_reimbursement_info',
@@ -438,13 +438,13 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        processService.getByName('会计-报销审批').then((data) => {
+        processService.getByName('报销审批').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionId = data.id
             this.procDefKey = data.key
           }
         })
-		  processService.getByName('会计-报销审批-电子发票').then((data) => {
+		  processService.getByName('报销审批-电子发票').then((data) => {
 			  if (!this.commonJS.isEmpty(data.id)) {
 				  this.processDefinitionIdInvoice = data.id
 				  this.procDefKeyInvoice = data.key
@@ -524,7 +524,7 @@
           ...this.searchForm
         }).then((res) => {
           // 将二进制流文件写入excel表，以下为重要步骤
-          this.$utils.downloadExcel(res, '会计-报销审批列表信息')
+          this.$utils.downloadExcel(res, '报销审批列表信息')
           this.loading = false
         }).catch(function (err) {
           this.loading = false

src/views/cw/reimbursementApproval/info/ReimbursementForm.vue

@@ -1441,27 +1441,27 @@
       },
       // 送审
       async startFormTrue (callback) {
-		  let title = `发起流程【会计-报销审批】`
-		  let describe = `[会计-报销审批]`
+		  let title = `发起流程【报销审批】`
+		  let describe = `[报销审批]`
 		  if (this.inputForm.reimbursementType) {
 			  if (this.inputForm.reimbursementType === '0') {
-				  await processService.getByName('会计-报销审批').then((data) => {
+				  await processService.getByName('报销审批').then((data) => {
 					  if (!this.commonJS.isEmpty(data.id)) {
 						  this.inputForm.procDefId = data.id
 						  this.inputForm.procDefKey = data.key
 					  }
 				  })
-				  title = `发起流程【会计-报销审批】`
-				  describe = `[会计-报销审批]`
+				  title = `发起流程【报销审批】`
+				  describe = `[报销审批]`
 			  } else if (this.inputForm.reimbursementType === '1') {
-				  await processService.getByName('会计-报销审批-电子发票').then((data) => {
+				  await processService.getByName('报销审批-电子发票').then((data) => {
 					  if (!this.commonJS.isEmpty(data.id)) {
 						  this.inputForm.procDefId = data.id
 						  this.inputForm.procDefKey = data.key
 					  }
 				  })
-				  title = `发起流程【会计-报销审批-电子发票】`
-				  describe = `[会计-报销审批-电子发票]`
+				  title = `发起流程【报销审批-电子发票】`
+				  describe = `[报销审批-电子发票]`
 			  }
 		  }
         this.$refs['inputForm'].validate(async (valid) => {

src/views/cw/workClientInfo/WorkClientChooseRadio.vue

@@ -42,8 +42,8 @@
 
 
           <el-form-item>
-            <el-button type="primary" @click="list()" size="large" icon="el-icon-search">查询</el-button>
-            <el-button @click="resetSearch()" size="large" icon="el-icon-refresh-right">重置</el-button>
+            <el-button type="primary" @click="list()">查询</el-button>
+            <el-button @click="resetSearch()">重置</el-button>
           </el-form-item>
         </el-form>
 

src/views/cw/workClientInfo/WorkClientList.vue

@@ -362,7 +362,7 @@
           this.loading = false
         })
         this.checkIsAdmin()
-        processService.getByName('会计-客户修改').then(async (data) => {
+        processService.getByName('客户修改').then(async (data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             this.processDefinitionAuditId = data.id
             this.procDefAuditKey = data.key
@@ -411,8 +411,8 @@
       },
       start () {
         // 读取流程表单
-        let tabTitle = `发起流程【会计-客户修改】`
-        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-客户修改]`
+        let tabTitle = `发起流程【客户修改】`
+        let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [客户修改]`
         taskService.getTaskDef({ procDefId: this.processDefinitionAuditId,
           status: 'startAndHold'}).then((data) => {
             this.$router.push({
@@ -438,8 +438,8 @@
           this.$store.dispatch('tagsView/delView', {fullPath: this.$route.fullPath})
           this.$router.push({query: {}})
           // 读取流程表单
-          let title = `发起流程【会计-客户修改】`
-          let processTitle = `${this.userName} 发起了 ${data.no} - ${data.name} [会计-客户修改]`
+          let title = `发起流程【客户修改】`
+          let processTitle = `${this.userName} 发起了 ${data.no} - ${data.name} [客户修改]`
           let status = 'startAndClose'
           if (data.status === '3') {
             status = 'startAndClose'
@@ -477,8 +477,8 @@
             this.refreshList()
           } else {
             // 读取流程表单
-            let title = `发起流程【会计-客户修改】`
-            let processTitle = `${this.userName} 发起了 ${row.no} - ${row.name} [会计-客户修改]`
+            let title = `发起流程【客户修改】`
+            let processTitle = `${this.userName} 发起了 ${row.no} - ${row.name} [客户修改]`
             let status = 'startAndClose'
             if (row.status === '3') {
               status = 'startAndClose'
@@ -523,8 +523,8 @@
                 ...pick(data, 'formType', 'formUrl', 'procDefKey', 'taskDefKey', 'procInsId', 'procDefId', 'taskId', 'status', 'title'),
                 isShow: 'false',
                 readOnly: true,
-                title: '会计-客户修改' + '流程详情',
-                formTitle: '会计-客户修改' + '流程详情',
+                title: '客户修改' + '流程详情',
+                formTitle: '客户修改' + '流程详情',
                 businessId: row.id,
                 status: 'reback'
               }

src/views/cw/workContract/ContractFileForm.vue

@@ -179,8 +179,8 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="合同金额(元)" prop="contractAmount" v-if="inputForm.contractAmountType === '1'"
+        <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+          <el-form-item label="合同金额(元)" prop="contractAmount"
                         :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                ]">

src/views/cw/workContract/ContractNameForm.vue

@@ -202,8 +202,8 @@
           </el-form-item>
         </el-col>
 
-              <el-col :span="12">
-                <el-form-item label="合同金额(元)" prop="contractAmount" v-if="inputForm.contractAmountType === '1'"
+              <el-col :span="12" v-if="inputForm.contractAmountType === '1'">
+                <el-form-item label="合同金额(元)" prop="contractAmount"
                               :rules="[
                         {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                      ]">
@@ -1110,26 +1110,26 @@
         let fees = this.inputForm.contractFees
         if (fees.length > 0) {
           fees.forEach(i => {
-            if (i === '1') {
-              i = '苏会协[2010]52号'
-              fee = fee + ';' + i
-            }
-            if (i === '2') {
-              i = '苏政办发[2010]101号'
-              fee = fee + ';' + i
-            }
-            if (i === '3') {
-              i = '苏价费[2010]284号'
-              fee = fee + ';' + i
-            }
-            if (i === '4') {
-              i = '发改价格[2010]196号'
-              fee = fee + ';' + i
-            }
-            if (i === '5') {
-              i = '其他'
-              fee = fee + ';' + i
-            }
+			  if (i === '1') {
+				  i = '计价格(2002)1980号文下浮%'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '2') {
+				  i = '苏价服(2014)383号文下浮%'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '3') {
+				  i = '苏建价协(2022)7号'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '4') {
+				  i = '标段 元/标段'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '5') {
+				  i = '其他'
+				  fee = fee + ';' + i
+			  }
             this.inputForm.contractFee = fee.substring(1, fee.length)
           })
         } else {

src/views/cw/workContract/ContractRegistration.vue

@@ -71,7 +71,7 @@
                   children: 'children'    // 子级字段名
                 }"
 
-				  :url="`/system-server/sys/office/treeData?type=1`"
+				  :url="`/system-server/sys/office/treeData?type=2`"
 				  :value="searchForm.department"
 				  :accordion="true"
 				  size="default"
@@ -188,8 +188,8 @@
           <vxe-column title="操作" min-width="200px" fixed="right" align="center">
             <template  #default="scope">
               <div v-if="isAdmin">
-                <el-button v-if="scope.row.filedPaperType === '5'" text type="primary" size="small" @click="edit(scope.row)">修改</el-button>
-                <el-button v-if="scope.row.filedPaperType === '5'" text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
+                <el-button v-if="scope.row.status === '5'" text type="primary" size="small" @click="edit(scope.row)">修改</el-button>
+                <el-button v-if="scope.row.status === '5'" text type="primary" size="small" @click="del(scope.row.id)">删除</el-button>
               </div>
               <div v-else>
 <!--              <el-button v-if="hasPermission('cw:workContract:view')" text type="primary" size="small" @click="view(scope.row.id)">查看</el-button>-->
@@ -721,12 +721,12 @@
       }, */
       // 借用
       borrow (row) {
-        processService.getByName('会计-合同借用').then((data) => {
+        processService.getByName('合同借用').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
             let tabTitle = ' ' + row.contractNo + ' - ' + row.contractName
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-合同借用]'
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[合同借用]'
             taskService.getTaskDef({ procDefId: data.id,
               businessId: row.id,
               businessTable: 'cw_work_contract_borrow',
@@ -795,12 +795,12 @@
       // 纸质归档
       paperFiled (row) {
         console.log('row', row)
-        processService.getByName('会计-合同纸质归档').then((data) => {
+        processService.getByName('合同纸质归档').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
             let tabTitle = ' ' + row.contractNo + ' - ' + row.contractName
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[会计-合同纸质归档]'
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 ` + tabTitle + '[合同纸质归档]'
             taskService.getTaskDef({ procDefId: data.id,
               businessId: row.id,
               businessTable: 'cw_work_contract_file_paper',
@@ -828,12 +828,12 @@
       },
       // 纸质归档撤回驳回修改
       paperFiledAndClose (id) {
-        processService.getByName('会计-合同纸质归档').then((data) => {
+        processService.getByName('合同纸质归档').then((data) => {
           if (!this.commonJS.isEmpty(data.id)) {
             // console.log('data', data)
             // 读取流程表单
-            let tabTitle = `发起流程【会计-合同纸质归档】`
-            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [会计-合同纸质归档]`
+            let tabTitle = `发起流程【合同纸质归档】`
+            let processTitle = `${this.userName} 在 ${this.moment(new Date()).format('YYYY-MM-DD HH:mm')} 发起了 [合同纸质归档]`
             taskService.getTaskDef({ procDefId: data.id,
               businessId: id,
               businessTable: 'cw_work_contract_file_paper',

src/views/cw/workContract/contractRegisitionAddForm/ContractAddForm.vue

@@ -873,19 +873,19 @@
 			if (fees.length > 0) {
 				fees.forEach(i => {
 					if (i === '1') {
-						i = '苏会协[2010]52号'
+						i = '计价格(2002)1980号文下浮%'
 						fee = fee + ';' + i
 					}
 					if (i === '2') {
-						i = '苏政办发[2010]101号'
+						i = '苏价服(2014)383号文下浮%'
 						fee = fee + ';' + i
 					}
 					if (i === '3') {
-						i = '苏价费[2010]284号'
+						i = '苏建价协(2022)7号'
 						fee = fee + ';' + i
 					}
 					if (i === '4') {
-						i = '发改价格[2010]196号'
+						i = '标段 元/标段'
 						fee = fee + ';' + i
 					}
 					if (i === '5') {

src/views/sys/login/components/banner.vue

@@ -29,18 +29,18 @@ export default {
 		carouselItem() {
 			return [
 				{
-					slogan: "兴光业务管理系统",
+					slogan: "兴光项目管理系统",
 					subSlogan:
 						"",
 					image: image3,
 				},
 				{
-					slogan: "兴光业务管理系统",
+					slogan: "兴光项目管理系统",
 					subSlogan: "",
 					image: image1,
 				},
 				{
-					slogan: "兴光业务管理系统",
+					slogan: "兴光项目管理系统",
 					subSlogan:
 						"",
 					image: image2,

src/views/sys/mould/SerialnumTplForm.vue

@@ -99,42 +99,48 @@
               </template>
             </vxe-toolbar>
           </el-form-item>
+		  <el-row  :gutter="15" >
+			  <el-col :span="24">
+				<vxe-table
+				  border
+				  show-footer
+				  show-overflow
+				  ref="xTable"
+				  :key="detailKey"
+				  class="vxe-table-element"
+				  :data="mouldList"
+				  :disabled="method==='view'"
+				  style="margin-left: 5em"
+				  highlight-current-row
+				  :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '#'}"
+				>
 
-        <vxe-table
-          border
-          show-overflow
-          ref="xTable"
-          class="vxe-table-element"
-          :data="mouldList"
-          :disabled="method==='view'"
-          style="margin-left: 5em"
-          :edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: true, icon: '#'}"
-        >
-
-          <vxe-table-column field="type" title="变量名称" :edit-render="{name: '$select', options: $dictUtils.getDictList('variable_type')}">
-            <template #edit="scope" >
-              <vxe-select v-model="scope.row.type" @change="variableValue(scope.row, scope.row.type)" transfer>
-                <vxe-option
-                  v-for="item in $dictUtils.getDictList('variable_type')"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label">
-                </vxe-option>
-              </vxe-select>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column field="value" title="变量值" :edit-render="{}">
-            <template #edit="scope">
-              <el-input :disabled="scope.row.showType" v-model="scope.row.value" ></el-input>
-            </template>
-          </vxe-table-column>
-          <vxe-table-column title="操作" width="100">
-            <template v-slot="scope">
-              <el-button  type="danger" @click="removeEvent(scope.row,scope.$rowIndex)">删除</el-button>
-            </template>
-          </vxe-table-column>
-        </vxe-table>
+				  <vxe-table-column field="type" title="变量名称" :edit-render="{name: '$select', options: $dictUtils.getDictList('variable_type')}">
+					<template #edit="scope" >
+					  <vxe-select v-model="scope.row.type" @change="variableValue(scope.row, scope.row.type)" transfer>
+						<vxe-option
+						  v-for="item in $dictUtils.getDictList('variable_type')"
+						  :key="item.value"
+						  :value="item.value"
+						  :label="item.label">
+						</vxe-option>
+					  </vxe-select>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column field="value" title="变量值" :edit-render="{}">
+					<template #edit="scope">
+					  <el-input :disabled="scope.row.showType" v-model="scope.row.value" ></el-input>
+					</template>
+				  </vxe-table-column>
+				  <vxe-table-column title="操作" width="100">
+					<template v-slot="scope">
+					  <el-button  type="danger" @click="removeEvent(scope.row,scope.$rowIndex)">删除</el-button>
+					</template>
+				  </vxe-table-column>
+				</vxe-table>
 
+			  </el-col>
+		  </el-row>
       </el-form>
 		<template #footer>
 			<span  class="dialog-footer">
@@ -186,6 +192,7 @@
           serialTplEx: ''
         },
         mouldList: [],
+		  detailKey: '',
         mould: {
           type: '',
           value: '',
@@ -296,6 +303,7 @@
         } else {
           await this.$refs.xTable.insert().then((data) => {
             this.mouldList.push(data)
+			  this.detailKey = Math.random()
           })
         }
       },

src/views/sys/office/OfficeDetail.vue

@@ -67,6 +67,15 @@
 				</template>
 				{{ inputForm.area }}
 			</el-descriptions-item>
+
+			<el-descriptions-item>
+				<template #label>
+					<div class="cell-item">分管领导</div>
+				</template>
+				{{ inputForm.administratorName }}
+			</el-descriptions-item>
+
+
 			<el-descriptions-item>
 				<template #label>
 					<div class="cell-item">详细地址</div>
@@ -123,6 +132,7 @@ export default {
 					name: null,
 				},
 				name: "",
+				administratorName: "", //分管领导
 				sort: "30",
 				area: "", // 归属区域
 				code: "", // 机构编码

src/views/sys/office/OfficeForm.vue

@@ -53,6 +53,9 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
+
+
+
 				<el-form-item
 					label="机构名称"
 					prop="name"
@@ -70,6 +73,8 @@
 					></el-input>
 				</el-form-item>
 
+
+
 				<el-form-item
 					label="机构编码"
 					prop="code"
@@ -87,6 +92,8 @@
 					></el-input>
 				</el-form-item>
 
+
+
 				<el-form-item
 					label="机构类型"
 					prop="type"
@@ -114,9 +121,22 @@
 						</el-option>
 					</el-select>
 				</el-form-item>
+
+
 				<el-form-item label="所属区域" prop="area">
 					<Area v-model="inputForm.area" />
 				</el-form-item>
+
+				<el-form-item label="分管领导" prop="administrator" :rules="[
+						{
+							required: true,
+							message: '分管领导不能为空',
+							trigger: 'blur',
+						},
+					]">
+					<UserSelect :limit='1' :modelValue="inputForm.administrator" @update:modelValue='(value, label) => {inputForm.administrator = value}'></UserSelect>
+				</el-form-item>
+
 				<el-form-item
 					label="详细地址"
 					prop="address"
@@ -133,6 +153,8 @@
 						placeholder="请输入地址"
 					></el-input>
 				</el-form-item>
+
+
 				<el-form-item
 					label="邮政编码"
 					prop="zipCode"
@@ -149,6 +171,8 @@
 						placeholder="请输入邮政编码"
 					></el-input>
 				</el-form-item>
+
+
 				<el-form-item
 					:label="
 						inputForm.type === '1' ? '公司负责人' : '部门负责人'
@@ -167,6 +191,8 @@
 						placeholder="请输入负责人"
 					></el-input>
 				</el-form-item>
+
+
 				<el-form-item
 					label="联系电话"
 					prop="phone"
@@ -183,6 +209,8 @@
 						placeholder="请输入联系电话"
 					></el-input>
 				</el-form-item>
+
+
 				<el-form-item
 					label="是否可用"
 					prop="useable"
@@ -211,6 +239,8 @@
 					</el-select>
 				</el-form-item>
 
+
+
 				<el-form-item label="备注" prop="remarks">
 					<el-input
 						maxlength="200"
@@ -220,6 +250,8 @@
 						placeholder="备注"
 					></el-input>
 				</el-form-item>
+
+
 				<el-form-item>
 					<el-button
 						type="primary"
@@ -237,10 +269,12 @@
 <script>
 import officeService from "@/api/sys/officeService";
 import Area from "@/components/areaSelect";
+import UserSelect from '@/components/userSelect'
 export default {
 	props: ["dataList"],
 	components: {
 		Area,
+		UserSelect,
 	},
 	data() {
 		return {
@@ -259,6 +293,7 @@ export default {
 				},
 				sort: "30",
 				area: "", // 归属区域
+				administrator: "", // 分管领导
 				code: "", // 机构编码
 				type: "", // 机构类型（1：公司；2：部门）
 				address: "", // 联系地址

src/views/sys/user/UserForm.vue

@@ -171,7 +171,7 @@
 						label="手机"
 						prop="mobile"
 						:rules="[
-							{ validator: validator.isMobile, trigger: 'blur' },
+							{required: true, message: '手机号不能为空', validator: validator.isMobile, trigger: 'blur' },
 						]"
 					>
 						<el-input
@@ -697,11 +697,6 @@
 						label="工号"
 						prop="no"
 						:rules="[
-							{
-								required: true,
-								message: '工号不能为空',
-								trigger: 'blur',
-							},
 						]"
 					>
 						<el-input

src/views/sys/workContract/WorkContractFileForm.vue

@@ -729,26 +729,26 @@
         let fees = this.inputForm.contractFees
         if (fees.length > 0) {
           fees.forEach(i => {
-            if (i === '1') {
-              i = '苏会协[2010]52号'
-              fee = fee + ';' + i
-            }
-            if (i === '2') {
-              i = '苏政办发[2010]101号'
-              fee = fee + ';' + i
-            }
-            if (i === '3') {
-              i = '苏价费[2010]284号'
-              fee = fee + ';' + i
-            }
-            if (i === '4') {
-              i = '发改价格[2010]196号'
-              fee = fee + ';' + i
-            }
-            if (i === '5') {
-              i = '其他'
-              fee = fee + ';' + i
-            }
+			  if (i === '1') {
+				  i = '计价格(2002)1980号文下浮%'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '2') {
+				  i = '苏价服(2014)383号文下浮%'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '3') {
+				  i = '苏建价协(2022)7号'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '4') {
+				  i = '标段 元/标段'
+				  fee = fee + ';' + i
+			  }
+			  if (i === '5') {
+				  i = '其他'
+				  fee = fee + ';' + i
+			  }
             this.inputForm.contractFee = fee.substring(1, fee.length)
           })
         } else {

src/views/workClient/WorkClientForm.vue

@@ -41,7 +41,7 @@
                 </vxe-table>
 
 				  <template #reference>
-					  <el-button type="info" @click="getPopTable" style="width: 100%" plain>查询</el-button>
+					  <el-button type="primary" @click="getPopTable" style="width: 100%" plain>查询</el-button>
 				  </template>
 
               </el-popover>