|
@@ -1,6 +1,6 @@
|
|
<template>
|
|
<template>
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
- <div v-if="(showSurrender==0)">
|
|
|
|
|
|
+ <div v-if="(showSurrender == 0)">
|
|
<!-- 筛选条件 -->
|
|
<!-- 筛选条件 -->
|
|
<div>
|
|
<div>
|
|
<Collapse :screen-form="screenForm">
|
|
<Collapse :screen-form="screenForm">
|
|
@@ -69,7 +69,6 @@
|
|
<el-form-item label="是否退押 " prop="isRefundDeposit">
|
|
<el-form-item label="是否退押 " prop="isRefundDeposit">
|
|
<el-select v-model="screenForm.isRefundDeposit" style="width: 100%" placeholder="请选择是否退押 ">
|
|
<el-select v-model="screenForm.isRefundDeposit" style="width: 100%" placeholder="请选择是否退押 ">
|
|
<el-option label="默认" :value="null" />
|
|
<el-option label="默认" :value="null" />
|
|
-
|
|
|
|
<el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label"
|
|
<el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label"
|
|
:value="item.value" />
|
|
:value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
@@ -77,11 +76,10 @@
|
|
</el-col>
|
|
</el-col>
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-col :xs="24" :sm="12" :lg="6">
|
|
<el-form-item label="状态 " prop="examineStatus">
|
|
<el-form-item label="状态 " prop="examineStatus">
|
|
- <el-select v-model="screenForm.examineStatus" style="width: 100%" placeholder="请选择状态 ">
|
|
|
|
- <el-option label="默认" :value="null" />
|
|
|
|
-
|
|
|
|
- <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label"
|
|
|
|
- :value="item.value" />
|
|
|
|
|
|
+ <el-select v-default-select="[examine]" v-model="screenForm.examineStatus" style="width: 100%"
|
|
|
|
+ placeholder="请选择状态 " multiple>
|
|
|
|
+ <el-option :disabled="examine == item.value" v-for="item in examineStatusArr" :key="item.value"
|
|
|
|
+ :label="item.label" :value="item.value" />
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -182,23 +180,13 @@
|
|
<el-form-item label="寄厂日期" style="margin-bottom: 0">
|
|
<el-form-item label="寄厂日期" style="margin-bottom: 0">
|
|
<div class="fanwei">
|
|
<div class="fanwei">
|
|
<el-form-item prop="startMailFactoryDate">
|
|
<el-form-item prop="startMailFactoryDate">
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.startMailFactoryDate"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- class="dateStyle"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="选择日期"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-date-picker v-model="screenForm.startMailFactoryDate" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ class="dateStyle" type="datetime" placeholder="选择日期" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<span>-</span>
|
|
<span>-</span>
|
|
<el-form-item prop="endMailFactoryDate">
|
|
<el-form-item prop="endMailFactoryDate">
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.endMailFactoryDate"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- class="dateStyle"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="选择日期"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-date-picker v-model="screenForm.endMailFactoryDate" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ class="dateStyle" type="datetime" placeholder="选择日期" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -208,24 +196,14 @@
|
|
<div class="fanwei">
|
|
<div class="fanwei">
|
|
<el-form-item prop="startSettlementDate">
|
|
<el-form-item prop="startSettlementDate">
|
|
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.startSettlementDate"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- class="dateStyle"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="选择日期"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-date-picker v-model="screenForm.startSettlementDate" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ class="dateStyle" type="datetime" placeholder="选择日期" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<span>-</span>
|
|
<span>-</span>
|
|
<el-form-item prop="endSettlementDate">
|
|
<el-form-item prop="endSettlementDate">
|
|
|
|
|
|
- <el-date-picker
|
|
|
|
- v-model="screenForm.endSettlementDate"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- class="dateStyle"
|
|
|
|
- type="datetime"
|
|
|
|
- placeholder="选择日期"
|
|
|
|
- />
|
|
|
|
|
|
+ <el-date-picker v-model="screenForm.endSettlementDate" value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
+ class="dateStyle" type="datetime" placeholder="选择日期" />
|
|
</el-form-item>
|
|
</el-form-item>
|
|
</div>
|
|
</div>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -457,7 +435,7 @@
|
|
<!-- <el-button type="text" class="textColor"
|
|
<!-- <el-button type="text" class="textColor"
|
|
v-if="(scope.row.examineStatus == 'OK' ||scope.row.examineStatus == 'AMEND') && isCustomer"
|
|
v-if="(scope.row.examineStatus == 'OK' ||scope.row.examineStatus == 'AMEND') && isCustomer"
|
|
@click="replenishClick(scope.row.depositManageId)">补充资料</el-button> -->
|
|
@click="replenishClick(scope.row.depositManageId)">补充资料</el-button> -->
|
|
- <el-button type="text" class="textColor"
|
|
|
|
|
|
+ <el-button type="text" class="textColor"
|
|
v-if="scope.row.examineStatus == 'WAIT_REVIEW' && $checkBtnRole('examine', $route.meta.roles)"
|
|
v-if="scope.row.examineStatus == 'WAIT_REVIEW' && $checkBtnRole('examine', $route.meta.roles)"
|
|
@click="reexamineClick(scope.row.depositManageId)">复核</el-button>
|
|
@click="reexamineClick(scope.row.depositManageId)">复核</el-button>
|
|
|
|
|
|
@@ -466,9 +444,9 @@
|
|
scope.row.examineStatus == 'OK' ||
|
|
scope.row.examineStatus == 'OK' ||
|
|
scope.row.examineStatus == 'FAIL' ||
|
|
scope.row.examineStatus == 'FAIL' ||
|
|
scope.row.examineStatus == 'WAIT_REVIEW' ||
|
|
scope.row.examineStatus == 'WAIT_REVIEW' ||
|
|
- scope.row.examineStatus == 'REVIEW' ||
|
|
|
|
- scope.row.examineStatus == 'AMEND'
|
|
|
|
-
|
|
|
|
|
|
+ scope.row.examineStatus == 'REVIEW' ||
|
|
|
|
+ scope.row.examineStatus == 'AMEND'
|
|
|
|
+
|
|
" @click="infoFn(scope.row.depositManageId)">详情</el-button>
|
|
" @click="infoFn(scope.row.depositManageId)">详情</el-button>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -482,9 +460,9 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <refund-list-detail v-else-if="(showSurrender==1)" :detail-id="detailId" @updateList="updateList" />
|
|
|
|
- <refund-replenish v-else-if="(showSurrender==2)" :detail-id="detailId" @updateList="updateList"/>
|
|
|
|
- <refund-reexamine v-else-if="(showSurrender==3)" :detail-id="detailId" @updateList="updateList"/>
|
|
|
|
|
|
+ <refund-list-detail v-else-if="(showSurrender == 1)" :detail-id="detailId" @updateList="updateList" />
|
|
|
|
+ <refund-replenish v-else-if="(showSurrender == 2)" :detail-id="detailId" @updateList="updateList" />
|
|
|
|
+ <refund-reexamine v-else-if="(showSurrender == 3)" :detail-id="detailId" @updateList="updateList" />
|
|
<examine-dialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
|
|
<examine-dialog :is-show.sync="isShowExamineDialog" :examine-form.sync="examineForm" />
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
@@ -511,6 +489,35 @@ export default {
|
|
RefundReplenish,
|
|
RefundReplenish,
|
|
RefundReexamine
|
|
RefundReexamine
|
|
},
|
|
},
|
|
|
|
+ directives: {
|
|
|
|
+ 'defaultSelect': {
|
|
|
|
+ bind(el, binding) {
|
|
|
|
+ const [defaultValues] = binding.value
|
|
|
|
+ // el.style.display = 'none'
|
|
|
|
+ // console.log(defaultValues);
|
|
|
|
+ // const dealStyle = function (tags) {
|
|
|
|
+
|
|
|
|
+ // tags.forEach((el, index) => {
|
|
|
|
+ // if (index <= defaultValues.length - 1 && ![...el.classList].includes('select-tag-close-none')) {
|
|
|
|
+
|
|
|
|
+ // }
|
|
|
|
+ // })
|
|
|
|
+ // }
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ // const tags = el.querySelectorAll('.el-tag__close')
|
|
|
|
+ // console.log(el,tags);
|
|
|
|
+ // if (tags.length == 0) {
|
|
|
|
+
|
|
|
|
+ // const tagTemp = el.querySelectorAll('.el-tag__close')
|
|
|
|
+ // console.log(tagTemp);
|
|
|
|
+ // dealStyle(tagTemp)
|
|
|
|
+ // } else {
|
|
|
|
+ // dealStyle(tags)
|
|
|
|
+ // }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ },
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
importFileList: [],
|
|
importFileList: [],
|
|
@@ -519,6 +526,7 @@ export default {
|
|
pageSize: 10, // 每页数量
|
|
pageSize: 10, // 每页数量
|
|
listTotal: 0, // 列表总数
|
|
listTotal: 0, // 列表总数
|
|
dataList: [], // 列表数据
|
|
dataList: [], // 列表数据
|
|
|
|
+ examine: '',
|
|
screenForm: {
|
|
screenForm: {
|
|
confirmName: '', // 审核人
|
|
confirmName: '', // 审核人
|
|
createName: '', // 创建人
|
|
createName: '', // 创建人
|
|
@@ -526,7 +534,7 @@ export default {
|
|
endDeliverTime: '', // 发货申请日期-结束
|
|
endDeliverTime: '', // 发货申请日期-结束
|
|
enginOrderNo: '', // 工程订单编号
|
|
enginOrderNo: '', // 工程订单编号
|
|
enginOrderType: 'HOME', // 工程订单类型
|
|
enginOrderType: 'HOME', // 工程订单类型
|
|
- examineStatus: '', // 状态
|
|
|
|
|
|
+ examineStatus: [''], // 状态
|
|
refEnginRecordNo: '', // 登录单号
|
|
refEnginRecordNo: '', // 登录单号
|
|
refProjectName: '', // 项目名称
|
|
refProjectName: '', // 项目名称
|
|
refUseUnit: '', // 使用单位
|
|
refUseUnit: '', // 使用单位
|
|
@@ -549,9 +557,9 @@ export default {
|
|
geLiInerNote: '',
|
|
geLiInerNote: '',
|
|
startFactoryNo: '',
|
|
startFactoryNo: '',
|
|
endFactoryNo: '',
|
|
endFactoryNo: '',
|
|
- settlementStatus:'',mailFactoryStatus:'',
|
|
|
|
|
|
+ settlementStatus: '', mailFactoryStatus: '',
|
|
|
|
|
|
- startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',endMailFactoryDate:'',startMailFactoryDate:''
|
|
|
|
|
|
+ startInstallTime: '', endInstallTime: '', startSettlementDate: '', endSettlementDate: '', endMailFactoryDate: '', startMailFactoryDate: ''
|
|
}, // 搜索表单
|
|
}, // 搜索表单
|
|
refundDepositArr: [
|
|
refundDepositArr: [
|
|
{
|
|
{
|
|
@@ -566,6 +574,10 @@ export default {
|
|
isCollapse: true,
|
|
isCollapse: true,
|
|
examineStatusArr: [
|
|
examineStatusArr: [
|
|
{
|
|
{
|
|
|
|
+ label: '全部',
|
|
|
|
+ value: ''
|
|
|
|
+ },
|
|
|
|
+ {
|
|
label: '保存',
|
|
label: '保存',
|
|
value: 'SAVE'
|
|
value: 'SAVE'
|
|
},
|
|
},
|
|
@@ -584,10 +596,21 @@ export default {
|
|
{
|
|
{
|
|
label: '关闭',
|
|
label: '关闭',
|
|
value: 'CLOSE'
|
|
value: 'CLOSE'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ label: '保存(补充资料)',
|
|
|
|
+ value: 'AMEND'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ label: '待复核',
|
|
|
|
+ value: 'WAIT_REVIEW'
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ label: '复核',
|
|
|
|
+ value: 'REVIEW'
|
|
}
|
|
}
|
|
],
|
|
],
|
|
listLoading: false, // 列表加载loading
|
|
listLoading: false, // 列表加载loading
|
|
- examine: '',
|
|
|
|
showSurrender: 0,
|
|
showSurrender: 0,
|
|
detailId: '',
|
|
detailId: '',
|
|
selectData: [],
|
|
selectData: [],
|
|
@@ -620,11 +643,11 @@ export default {
|
|
})
|
|
})
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
- replenishClick(id){
|
|
|
|
|
|
+ replenishClick(id) {
|
|
this.detailId = id
|
|
this.detailId = id
|
|
this.showSurrender = 2
|
|
this.showSurrender = 2
|
|
},
|
|
},
|
|
- reexamineClick(id){
|
|
|
|
|
|
+ reexamineClick(id) {
|
|
this.detailId = id
|
|
this.detailId = id
|
|
this.showSurrender = 3
|
|
this.showSurrender = 3
|
|
},
|
|
},
|
|
@@ -655,7 +678,7 @@ export default {
|
|
// endDeliverTime: "",
|
|
// endDeliverTime: "",
|
|
enginOrderNo: '',
|
|
enginOrderNo: '',
|
|
enginOrderType: this.enginOrderType,
|
|
enginOrderType: this.enginOrderType,
|
|
- examineStatus: '',
|
|
|
|
|
|
+ examineStatus: [] || '',
|
|
refEnginRecordNo: '',
|
|
refEnginRecordNo: '',
|
|
refProjectName: '',
|
|
refProjectName: '',
|
|
refUseUnit: '',
|
|
refUseUnit: '',
|
|
@@ -669,8 +692,8 @@ export default {
|
|
// 打开 批量审批
|
|
// 打开 批量审批
|
|
batchExamine() {
|
|
batchExamine() {
|
|
if (this.selectData.length) {
|
|
if (this.selectData.length) {
|
|
- this.submitExamineForm()
|
|
|
|
- // this.isShowExamineDialog = true;
|
|
|
|
|
|
+ this.submitExamineForm()
|
|
|
|
+ // this.isShowExamineDialog = true;
|
|
return
|
|
return
|
|
}
|
|
}
|
|
this.$errorMsg('请选择')
|
|
this.$errorMsg('请选择')
|
|
@@ -722,7 +745,7 @@ export default {
|
|
// endDeliverTime: "",
|
|
// endDeliverTime: "",
|
|
enginOrderNo: '',
|
|
enginOrderNo: '',
|
|
enginOrderType: this.enginOrderType,
|
|
enginOrderType: this.enginOrderType,
|
|
- examineStatus: '',
|
|
|
|
|
|
+ examineStatus: [] || '',
|
|
refEnginRecordNo: '',
|
|
refEnginRecordNo: '',
|
|
refProjectName: '',
|
|
refProjectName: '',
|
|
refUseUnit: '',
|
|
refUseUnit: '',
|
|
@@ -742,7 +765,7 @@ export default {
|
|
// endDeliverTime: "",
|
|
// endDeliverTime: "",
|
|
enginOrderNo: '',
|
|
enginOrderNo: '',
|
|
enginOrderType: this.enginOrderType,
|
|
enginOrderType: this.enginOrderType,
|
|
- examineStatus: '',
|
|
|
|
|
|
+ examineStatus: [] || '',
|
|
refEnginRecordNo: '',
|
|
refEnginRecordNo: '',
|
|
refProjectName: '',
|
|
refProjectName: '',
|
|
refUseUnit: '',
|
|
refUseUnit: '',
|
|
@@ -832,6 +855,9 @@ export default {
|
|
},
|
|
},
|
|
// 切换radio
|
|
// 切换radio
|
|
changeRadioFn(v) {
|
|
changeRadioFn(v) {
|
|
|
|
+ console.log(v, 888);
|
|
|
|
+ this.screenForm.examineStatus.pop()
|
|
|
|
+ this.screenForm.examineStatus[0] = v
|
|
this.examine = v
|
|
this.examine = v
|
|
this.getDataList({
|
|
this.getDataList({
|
|
pageSize: this.pageSize,
|
|
pageSize: this.pageSize,
|
|
@@ -884,9 +910,10 @@ export default {
|
|
createName: '',
|
|
createName: '',
|
|
enginOrderNo: '',
|
|
enginOrderNo: '',
|
|
enginOrderType: this.enginOrderType,
|
|
enginOrderType: this.enginOrderType,
|
|
- examineStatus: this.examine,
|
|
|
|
refUseUnit: '',
|
|
refUseUnit: '',
|
|
- ...this.screenForm
|
|
|
|
|
|
+ ...this.screenForm,
|
|
|
|
+ examineStatus: this.screenForm.examineStatus.join(',') || '',
|
|
|
|
+
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 详情
|
|
// 详情
|
|
@@ -897,7 +924,9 @@ export default {
|
|
async getDataList(data) {
|
|
async getDataList(data) {
|
|
getDepositCountList({
|
|
getDepositCountList({
|
|
enginOrderType: this.enginOrderType,
|
|
enginOrderType: this.enginOrderType,
|
|
- ...this.screenForm
|
|
|
|
|
|
+ ...this.screenForm,
|
|
|
|
+ examineStatus: this.screenForm.examineStatus.join(',') || '',
|
|
|
|
+
|
|
}).then(res => {
|
|
}).then(res => {
|
|
if (res.data) {
|
|
if (res.data) {
|
|
this.numSum = res.data
|
|
this.numSum = res.data
|