浏览代码

审核开户银行,待办已办发起人查询,签章附件显示

sangwenwei 1 年之前
父节点
当前提交
a95f05cc92

+ 11 - 1
src/views/cw/invoice/InvoiceFormTask.vue

@@ -171,7 +171,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col v-if="inputForm.billingType === '1'" :span="12">
+          <el-col v-if="inputForm.billingType === '1' && status !== 'audit'" :span="12">
             <el-form-item label="开户银行" prop="openBank"
                           :rules="[
                       {required: true, message:'开户银行不能为空', trigger:'blur'},{required: true, message:'开户银行不能为空', trigger:'change'}
@@ -186,6 +186,15 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col v-else="inputForm.billingType === '1' && status === 'audit'" :span="12">
+				<el-form-item label="开户银行" prop="openBank"
+							  :rules="[
+                      {required: true, message:'开户银行不能为空', trigger:'blur'},{required: true, message:'开户银行不能为空', trigger:'change'}
+             ]">
+					<el-input :disabled="true" placeholder="请填写开户银行" v-model="inputForm.openBank" clearable></el-input>
+				</el-form-item>
+			</el-col>
+
           <el-col v-if="inputForm.billingType === '1'" :span="12">
             <el-form-item label="银行账号" prop="bankAccount"
                           :rules="[
@@ -905,6 +914,7 @@
 								data.cwWorkClientBillingDTOList.forEach(i => {
 									i.ourBank = i.accountHolder
 									this.bankList.push(i)
+									this.inputForm.openBank=i.ourBank
 								})
 							} else {
 								this.bankList = []

+ 7 - 2
src/views/cw/reportManagement/ReportManagementSignatureForm.vue

@@ -619,7 +619,7 @@
           businessObjects: ''
         },
         keyWatch: '',
-        activeName: 'signatureFile',
+        activeName: '',
         tableKey: '',
         tableKeyClient: '1',
         interVal: ''
@@ -741,7 +741,7 @@
         }
       },
       init (method, id) {
-	  	this.activeName='signatureFile'
+	  	this.activeName=''
         this.method = method
         this.inputForm = {
           servedUnitId: '',  // 被服务单位id
@@ -856,6 +856,11 @@
             } else {
               this.method = 'false'
             }
+            if (this.status === 'taskFormDetail'){
+            	this.activeName='signatureFile'
+			}else {
+				this.activeName='archiveFile'
+			}
             if (this.commonJS.isEmpty(this.inputForm.signatureType) && this.method !== 'view') {
               this.inputForm.signatureType = '1'
             }

+ 19 - 2
src/views/flowable/task/HistoryList.vue

@@ -23,7 +23,13 @@
 				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
 			</el-form-item>
 			<el-form-item label="流程发起人" prop="assigneeId">
-				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value, label) => {searchForm.assigneeId = value}'></UserSelect2>
+				<el-input  v-model="searchForm.assigneeId" placeholder="请选择流程发起人">
+					<template #suffix>
+						<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+							<!--						<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value, label) => {searchForm.assigneeId = value}'></UserSelect2>-->
+						</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
@@ -146,6 +152,10 @@
 				</vxe-pager>
 			</div>
 		</div>
+		<user-select2
+			ref="userSelect2"
+			@doSubmit="selectUser">
+		</user-select2>
 	</div>
 </template>
 
@@ -153,7 +163,7 @@
 // import FlowChart from '../modeler/FlowChart'
 import pick from "lodash.pick";
 import taskService from "@/api/flowable/taskService";
-import UserSelect2 from '@/components/userSelect2';
+import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
 export default {
 	data() {
 		return {
@@ -290,6 +300,13 @@ export default {
 				this.refreshList();
 			});
 		},
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.assigneeId=user[0].name
+		}
 	},
 };
 </script>

+ 20 - 2
src/views/flowable/task/TodoList.vue

@@ -24,7 +24,13 @@
 				<el-input  v-model="searchForm.title" placeholder="实例标题" clearable></el-input>
 			</el-form-item>
 			<el-form-item label="流程发起人" prop="assigneeId">
-				<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value, label) => {searchForm.assigneeId = value}'></UserSelect2>
+				<el-input  v-model="searchForm.assigneeId" placeholder="请选择流程发起人">
+					<template #suffix>
+					<el-button style="background-color: white;color: #1b1e25;border-color: white;" type="primary" slot="append" icon="el-icon-search" @click="openUserDia">
+<!--						<UserSelect2  :modelValue="searchForm.assigneeId" :limit='1' @update:modelValue='(value, label) => {searchForm.assigneeId = value}'></UserSelect2>-->
+					</el-button>
+					</template>
+				</el-input>
 			</el-form-item>
 			<el-form-item>
 				<el-button type="primary" @click="refreshList()" icon="search"
@@ -167,6 +173,10 @@
 			:limit="1"
 			@doSubmit="selectUsersToTransferTask"
 		></user-select>
+		<user-select2
+			ref="userSelect2"
+			@doSubmit="selectUser">
+		</user-select2>
 	</div>
 </template>
 
@@ -175,7 +185,7 @@
 import pick from "lodash.pick";
 import UserSelect from "@/components/userSelect/UserSelectDialog";
 import taskService from "@/api/flowable/taskService";
-import UserSelect2 from '@/components/userSelect2';
+import UserSelect2 from '@/components/userSelect2/UserSelectDialog';
 export default {
 	data() {
 		return {
@@ -315,6 +325,14 @@ export default {
 				this.refreshList();
 			});
 		},
+		openUserDia(){
+			this.$refs.userSelect2.init()
+		},
+		selectUser(user){
+			console.log(user[0].name)
+			this.searchForm.assigneeId=user[0].name
+		}
+
 	},
 };
 </script>