Commit b7cd03d0 authored by 高宇's avatar 高宇

拍照上传功能加另外的参数

parent 2f98d7ca
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
<div class="CodeOne"> <div class="CodeOne">
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检查一单号: "> <el-form-item label="检查一单号: ">
<el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcOneCode" class="CodeOneInput"></el-input> <el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '9') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcOneCode" class="CodeOneInput"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1453,7 +1453,7 @@ ...@@ -1453,7 +1453,7 @@
<div class="CodeOne"> <div class="CodeOne">
<el-form :model="inspectJbAl2o3List"> <el-form :model="inspectJbAl2o3List">
<el-form-item label="检查三单号: "> <el-form-item label="检查三单号: ">
<el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '2') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcTwoCode" class="CodeOneInput"></el-input> <el-input :disabled="((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '1') || ((controlsForm.controls == '3' || controlsForm.controls == '1' )&& controlsForm.approveStatus === '9') || ((controlsForm.controls == '3' || controlsForm.controls == '1')&& controlsForm.approveStatus === '3')" v-model="inspectJbAl2o3List.jcTwoCode" class="CodeOneInput"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
...@@ -1877,9 +1877,9 @@ ...@@ -1877,9 +1877,9 @@
v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')" v-if="(controlsForm.controls ==='2'&& controlsForm.approveStatus ==='0') || (controlsForm.controls ==='2'&& controlsForm.approveStatus ==='3')"
class="submitButton" class="submitButton"
> >
<el-button class="buttoonSave" type="primary" style="background-color: #5cbce5" @click="submitControl">保存 <el-button class="buttoonSave" type="primary" :loading="submitLoadIng" style="background-color: #5cbce5" @click="submitControl">保存
</el-button> </el-button>
<el-button class="buttoonCommit" type="primary" @click="present">提交</el-button> <el-button class="buttoonCommit" type="primary" :loading="presentLoading" @click="present">提交</el-button>
</div> </div>
<!-- <div--> <!-- <div-->
<!-- v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"--> <!-- v-if="(controlsForm.controls ==='3'&& controlsForm.approveStatus ==='1') || (controlsForm.controls ==='3'&&controlsForm.approveStatus === '9' )"-->
...@@ -1888,8 +1888,8 @@ ...@@ -1888,8 +1888,8 @@
<!-- <el-button class="buttoon" type="primary" @click="back">返回</el-button>--> <!-- <el-button class="buttoon" type="primary" @click="back">返回</el-button>-->
<!-- </div>--> <!-- </div>-->
<div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="submitButton"> <div v-if="(controlsForm.controls ==='1'&& controlsForm.approveStatus ==='1')" class="submitButton">
<el-button class="buttoonSave" type="primary" @click="approve">同意</el-button> <el-button class="buttoonSave" type="primary" :loading="approveLoading" @click="approve">同意</el-button>
<el-button class="buttoonCommit" type="primary" @click="reject">驳回</el-button> <el-button class="buttoonCommit" type="primary" :loading="rejectLoading" @click="reject">驳回</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -1908,6 +1908,10 @@ export default { ...@@ -1908,6 +1908,10 @@ export default {
components: { TextToolTip }, components: { TextToolTip },
data() { data() {
return { return {
submitLoadIng: false,
presentLoading: false,
approveLoading: false,
rejectLoading: false,
ThirdFromRules: { ThirdFromRules: {
wgKx: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,4})?$/, message: '请输入有效的数字', trigger: 'change' }], wgKx: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,4})?$/, message: '请输入有效的数字', trigger: 'change' }],
wgLlw: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }], wgLlw: [{ pattern: /^(0|[1-9]\d*)(\.\d{0,6})?$/, message: '请输入有效的数字', trigger: 'change' }],
...@@ -2530,6 +2534,7 @@ export default { ...@@ -2530,6 +2534,7 @@ export default {
}, },
// 审核驳回 // 审核驳回
reject() { reject() {
this.rejectLoading = true
const obj = { const obj = {
businessId: this.inspectInfoList.businessId, businessId: this.inspectInfoList.businessId,
approveNote: this.inspectsForm.approveNote, approveNote: this.inspectsForm.approveNote,
...@@ -2538,15 +2543,19 @@ export default { ...@@ -2538,15 +2543,19 @@ export default {
approveInformation(obj).then(res => { approveInformation(obj).then(res => {
console.log('审核结果', res) console.log('审核结果', res)
if (res.code === 200) { if (res.code === 200) {
this.rejectLoading = false
this.$message.error('该审核已驳回') this.$message.error('该审核已驳回')
this.$router.push({ this.$router.push({
path: '/checkOneTbale' path: '/checkOneTbale'
}) })
} }
}).catch(() => {
this.rejectLoading = false
}) })
}, },
// 审核通过 // 审核通过
approve() { approve() {
this.approveLoading = true
const obj = { const obj = {
businessId: this.inspectInfoList.businessId, businessId: this.inspectInfoList.businessId,
approveNote: this.inspectsForm.approveNote, approveNote: this.inspectsForm.approveNote,
...@@ -2555,11 +2564,16 @@ export default { ...@@ -2555,11 +2564,16 @@ export default {
approveInformation(obj).then(res => { approveInformation(obj).then(res => {
console.log('审核结果', res) console.log('审核结果', res)
if (res.code === 200) { if (res.code === 200) {
this.approveLoading = false
this.$message.success('审核通过') this.$message.success('审核通过')
this.$router.push({ this.$router.push({
path: '/checkOneTbale' path: '/checkOneTbale'
}) })
} else {
this.approveLoading = false
} }
}).catch(() => {
this.approveLoading = false
}) })
}, },
// 获取详情 // 获取详情
...@@ -3148,6 +3162,7 @@ export default { ...@@ -3148,6 +3162,7 @@ export default {
return ossIdList return ossIdList
}, },
submitControl() { submitControl() {
this.submitLoadIng = true
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1) this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2) this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3)
...@@ -3167,7 +3182,12 @@ export default { ...@@ -3167,7 +3182,12 @@ export default {
this.getRecordInfo(response.data.incomeInspectInfo.businessId) this.getRecordInfo(response.data.incomeInspectInfo.businessId)
this.controlsForm.approveStatus = '0' this.controlsForm.approveStatus = '0'
this.controlsForm.controls = '2' this.controlsForm.controls = '2'
this.submitLoadIng = false
} else {
this.submitLoadIng = false
} }
}).catch(() => {
this.submitLoadIng = false
}) })
}, },
present() { present() {
...@@ -3183,6 +3203,7 @@ export default { ...@@ -3183,6 +3203,7 @@ export default {
this.$refs.inspectJbAl2o3ListThree.validate(ijbjTT => { this.$refs.inspectJbAl2o3ListThree.validate(ijbjTT => {
this.$refs.inspectJbAl2o3ListThirdFrom.validate(ijbjtf => { this.$refs.inspectJbAl2o3ListThirdFrom.validate(ijbjtf => {
if (vaild && ijbaO && iJbA && ijbaT && ijbjTT && ijbjtf) { if (vaild && ijbaO && iJbA && ijbaT && ijbjTT && ijbjtf) {
this.presentLoading = true
this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1) this.inspectJbAl2o3List.standardOneData = this.getStringByArray(this.inspectJbAl2o3List.recode1)
this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2) this.inspectJbAl2o3List.standardTwoData = this.getStringByArray(this.inspectJbAl2o3List.recode2)
this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3) this.inspectJbAl2o3List.limitData = this.getStringByArray(this.inspectJbAl2o3List.recode3)
...@@ -3197,6 +3218,9 @@ export default { ...@@ -3197,6 +3218,9 @@ export default {
addIncomeInspectInfo(obj).then(response => { addIncomeInspectInfo(obj).then(response => {
console.log('re', response) console.log('re', response)
if (response.code === 200) { if (response.code === 200) {
this.presentLoading = false
this.controlsForm.approveStatus = '0'
this.controlsForm.controls = '2'
this.msgSuccess('提交成功') this.msgSuccess('提交成功')
this.resetInspectInfo() this.resetInspectInfo()
this.resetinspectJbAl2o3List() this.resetinspectJbAl2o3List()
...@@ -3206,9 +3230,11 @@ export default { ...@@ -3206,9 +3230,11 @@ export default {
this.inspectInfoList.jcCode = response.data this.inspectInfoList.jcCode = response.data
} }
}) })
this.controlsForm.approveStatus = '1' } else {
this.controlsForm.controls = '2' this.presentLoading = false
} }
}).catch(() => {
this.presentLoading = false
}) })
} }
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment