sangwenwei пре 1 година
родитељ
комит
c8aca75955
1 измењених фајлова са 46 додато и 23 уклоњено
  1. 46 23
      src/views/jy/workContractInfo/WorkContractForm.vue

+ 46 - 23
src/views/jy/workContractInfo/WorkContractForm.vue

@@ -1,6 +1,6 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
 	<div>
-			<el-form size="default" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
+			<el-form size="default" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
 					 label-width="150px">
 
 				<el-divider v-if="(status === 'audit' || status === 'taskFormDetail'|| method==='view') && commonJS.isNotEmpty(inputForm.customerId)" content-position="left">
@@ -13,7 +13,7 @@
 									  :rules="[
                            {required: true, message: '请选择委托方', trigger: 'change'}
                  ]">
-							<el-input :readonly="true" maxlength="100" @focus="openWorkClient2()" v-model="inputForm.primaryLinkman" placeholder="请选择委托方">
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" :readonly="true" maxlength="100" @focus="openWorkClient2()" v-model="inputForm.primaryLinkman" placeholder="请选择委托方">
 								<!--              <el-button slot="append" icon="el-icon-search" @click="openWorkClient2()"></el-button>-->
 							</el-input>
 						</el-form-item>
@@ -46,19 +46,19 @@
 						<el-form-item label="合同名称" prop="contractName"
 									  :rules="[{required: true, message: '合同名称不能为空', trigger: 'blur'}
                  ]">
-							<el-input v-model="inputForm.contractName"  placeholder="请输入合同名称"     clearable></el-input>
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" v-model="inputForm.contractName"  placeholder="请输入合同名称"     clearable></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="合同编号" prop="contractNo">
-							<el-input maxlength="64" :readonly="true" v-model="inputForm.contractNo" placeholder="自动生成"></el-input>
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" maxlength="64" :readonly="true" v-model="inputForm.contractNo" placeholder="自动生成"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="合同类型" prop="contractTypes"
 									  :rules="[{required: true, message: '合同类型不能为空', trigger: 'blur'}
                  ]" >
-							<el-cascader style="width: 100%" v-model="inputForm.contractTypes" :options="typeData" @change="handleChange"  clearable  :props="{
+							<el-cascader :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" style="width: 100%" v-model="inputForm.contractTypes" :options="typeData" @change="handleChange"  clearable  :props="{
 			value: 'value',
 			label: 'label', // 显示名称
 			children: 'children', // 子级字段名
@@ -78,6 +78,7 @@
 								placement="bottom-start"
 								value-format="YYYY-MM-DD"
 								v-model="inputForm.contractDate"
+								:disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
 								style="width: 100%"
 								placeholder="选择日期">
 							</el-date-picker>
@@ -88,7 +89,8 @@
 							<el-date-picker
 								v-model="inputForm.effectiveDate"
 								value-format="YYYY-MM-DD"
-								style="width: 418px"
+								:disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
+								style="width: 100%"
 								placeholder="选择日期">
 							</el-date-picker>
 						</el-form-item>
@@ -100,7 +102,8 @@
 								@change="checkData"
 								value-format="YYYY-MM-DD"
 								v-model="inputForm.closingDate"
-								style="width: 418px"
+								:disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
+								style="width: 100%"
 								placeholder="选择日期">
 							</el-date-picker>
 						</el-form-item>
@@ -109,7 +112,7 @@
 
 					<el-col :span="12">
 						<el-form-item label="对方合同编号" prop="contractOpposite">
-							<el-input maxlength="64" v-model="inputForm.contractOpposite" placeholder="请填写对方合同编号"></el-input>
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" maxlength="64" v-model="inputForm.contractOpposite" placeholder="请填写对方合同编号"></el-input>
 						</el-form-item>
 					</el-col>
 
@@ -130,6 +133,7 @@
 								:url="`/system-server/sys/office/treeData?type=2`"
 								:value="inputForm.department"
 								:accordion="true"
+								:disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
 								size="default"
 								v-if="method!=='view'"
 								@getValue="(value) => {inputForm.department=value}"/>
@@ -145,7 +149,7 @@
 								value-format="YYYY-MM-DD"
 								v-model="inputForm.createTime"
 								style="width: 100%"
-								:disabled="true"
+								:disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
 								placeholder="选择日期">
 							</el-date-picker>
 						</el-form-item>
@@ -157,17 +161,31 @@
 									  :rules="[
                   {required: true, message:'请输入合同金额(元)', trigger:'blur'}
                ]">
-							<el-input maxlength="15" v-model="inputForm.contractAmount" placeholder="请输入合同金额(元)"
-									  @keyup.native="inputForm.contractAmount = twoDecimalPlaces(inputForm.contractAmount)"
+							<el-input maxlength="15" v-model="inputForm.contractAmount" placeholder="请输入合同金额(元)" :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'"
+									  v-on:input="inputForm.contractAmount=inputForm.contractAmount.replace(/[^\d.]/g,'')
+							  .replace(/^\./g,'')
+							  .replace(/\.{2,}/g,'.')
+							  .replace('.','$#$').replace(/\./g,'').replace('$#$','.')
+							  .replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')"
 							></el-input>
 						</el-form-item>
 					</el-col>
+
+					<el-col :span="12" v-if="$store.state.user.office.name ==='办公室'">
+						<el-form-item label="盒号" prop="filedNo"
+									  :rules="[
+											  {required: true, message:'请输入盒号', trigger:'blur'}
+										   ]">
+							<el-input :disabled="false" :readonly="false" maxlength="15" v-model="inputForm.filedNo"  placeholder="请输入盒号"></el-input>
+						</el-form-item>
+					</el-col>
+
 					<el-col>
 						<el-form-item label="付款摘要" prop="paymentDescribe"
 									  :rules="[
 							 {required: true, message:'请输入付款摘要', trigger:'blur'}
                ]">
-							<el-input type="textarea" v-model="inputForm.paymentDescribe" placeholder="根据实际付款方式进行填写"
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" type="textarea" v-model="inputForm.paymentDescribe" placeholder="根据实际付款方式进行填写"
 							></el-input>
 						</el-form-item>
 					</el-col>
@@ -176,7 +194,7 @@
 						<el-form-item label="合同特别条款" prop="contractSpecial"
 									  :rules="[
                ]">
-							<el-input type="textarea" v-model="inputForm.contractSpecial" placeholder="请输入合同特别条款"
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" type="textarea" v-model="inputForm.contractSpecial" placeholder="请输入合同特别条款"
 							></el-input>
 						</el-form-item>
 					</el-col>
@@ -185,7 +203,7 @@
 						<el-form-item label="备注" prop="remarks"
 									  :rules="[
                ]">
-							<el-input type="textarea" v-model="inputForm.remarks" placeholder="请输入备注"
+							<el-input :disabled="status === 'audit' || status === 'taskFormDetail'|| method==='view'" type="textarea" v-model="inputForm.remarks" placeholder="请输入备注"
 							></el-input>
 						</el-form-item>
 					</el-col>
@@ -216,9 +234,9 @@
 									highlight-current-row
 									:edit-config="{trigger: 'click', mode: 'row', showStatus: false, autoClear: false}"
 								>
-									<vxe-table-column align="center" field="number" title="客户编号" :edit-render="{}">
+									<vxe-table-column align="center" field="no" title="客户编号" :edit-render="{}">
 										<template v-slot:edit="scope">
-											<el-input :readonly="true" v-model="scope.row.number" placeholder="客户编号" clearable></el-input>
+											<el-input :readonly="true" v-model="scope.row.no" placeholder="客户编号" clearable></el-input>
 										</template>
 									</vxe-table-column>
 									<vxe-table-column align="center" field="name" title="客户名称" :edit-render="{}">
@@ -314,7 +332,7 @@
 					contractSpecial: '',
 					remarks: '',
 					clientName: '',
-					contractProperList: [],
+					contractProper: [],
 					status: '',
 					customerNo: '',
 					customerName: '',
@@ -326,6 +344,7 @@
 					uscCode: '',
 					customerNo: '',
 					contractFees: [],
+					workAttachmentList: [],
 					contractFee: '',
 					contractNo: '',
 					contractType: '',
@@ -346,7 +365,7 @@
 					createBy: this.$store.state.user.name,
 					createId: this.$store.state.user.id,
 					createTime: '',
-					contractProperList: [],
+					contractProper: [],
 					cwWorkClientContactDTOList: [],
 					contractAmountType: '',
 					contractOpposite: '',
@@ -358,7 +377,8 @@
 					contractDate:'',
 					effectiveDate: '',
 					closingDate: '',
-					contractTypeFirst:''
+					contractTypeFirst:'',
+					filedNo:''
 				},
 				activeName1: 'contractProper',
 				activeName:'contactParty',
@@ -477,6 +497,7 @@
 					uscCode: '',
 					customerNo: '',
 					contractFees: [],
+					workAttachmentList: [],
 					contractFee: '',
 					contractNo: '',
 					contractType: '',
@@ -499,13 +520,14 @@
 					createBy: this.$store.state.user.name,
 					createId: this.$store.state.user.id,
 					createTime: '',
-					contractProperList: [],
+					contractProper: [],
 					cwWorkClientContactDTOList: [],
 					contractAmountType: '',
 					contractOpposite: '',
 					contractTypes:[],
 					primaryLinkman:'',
-					contractTypeFirst:''
+					contractTypeFirst:'',
+					filedNo:''
 				}
 				this.inputForm.id = id
 
@@ -544,6 +566,7 @@
 									this.inputForm.customerNo=da[0].number
 								})
 							}
+
 							this.inputForm.department=data.department
 							console.log('data',data)
 							if (this.commonJS.isEmpty(this.inputForm.department)) {
@@ -555,7 +578,7 @@
 							if (this.status === 'audit' || this.status === 'taskFormDetail') {
 								method = 'view'
 							}
-							this.$refs.uploadComponent.newUpload(method, this.inputForm.contractProperList, 'jyWorkContract', null, null, null, null, false)
+							this.$refs.uploadComponent.newUpload(method, this.inputForm.workAttachmentList, 'jyWorkContract', null, null, null, null, false)
 							// this.$refs.archiveFile.newUpload('view', [], 'cwWorkContract', null, null, null, null, false)
 							this.loading = false
 						})
@@ -735,7 +758,7 @@
 				// console.log(event)
 			},
 			httpRequest (file) {
-				httpRequest(file, fileName(file), 'workContract')
+				httpRequest(file, fileName(file), 'jyWorkContract')
 			},
 			handleRemove () {
 				this.fileList = handleRemove()