Merge branch 'master_bug'

src/views/deposit_home/refund_list.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <div v-if="(showSurrender==0)">
+    <div v-if="(showSurrender == 0)">
       <!-- 筛选条件 -->
       <div>
         <Collapse :screen-form="screenForm">
@@ -15,9 +15,9 @@
               <el-radio-button label="WAIT">待审核</el-radio-button>
               <!--    <el-radio-button label="FAIL">审核驳回</el-radio-button> -->
               <el-radio-button label="OK">审核通过</el-radio-button>
-              <el-radio-button label="OK">保存（补充资料）</el-radio-button>
-              <el-radio-button label="OK">待复核</el-radio-button>
-              <el-radio-button label="OK">复核</el-radio-button>
+              <el-radio-button label="AMEND">保存（补充资料）</el-radio-button>
+              <el-radio-button label="WAIT_REVIEW">待复核</el-radio-button>
+              <el-radio-button label="REVIEW">复核</el-radio-button>
 
             </el-radio-group>
           </template>
@@ -182,23 +182,13 @@
                     <el-form-item label="寄厂日期" style="margin-bottom: 0">
                       <div class="fanwei">
                         <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>
                         <span>-</span>
                         <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>
                       </div>
                     </el-form-item>
@@ -208,24 +198,14 @@
                       <div class="fanwei">
                         <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>
                         <span>-</span>
                         <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>
                       </div>
                     </el-form-item>
@@ -235,24 +215,14 @@
                       <div class="fanwei">
                         <el-form-item prop="startOrderDate">
 
-                          <el-date-picker
-                            v-model="screenForm.startOrderDate"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            class="dateStyle"
-                            type="datetime"
-                            placeholder="选择日期"
-                          />
+                          <el-date-picker v-model="screenForm.startOrderDate" value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle" type="datetime" placeholder="选择日期" />
                         </el-form-item>
                         <span>-</span>
                         <el-form-item prop="endOrderDate">
 
-                          <el-date-picker
-                            v-model="screenForm.endOrderDate"
-                            value-format="yyyy-MM-dd HH:mm:ss"
-                            class="dateStyle"
-                            type="datetime"
-                            placeholder="选择日期"
-                          />
+                          <el-date-picker v-model="screenForm.endOrderDate" value-format="yyyy-MM-dd HH:mm:ss"
+                            class="dateStyle" type="datetime" placeholder="选择日期" />
                         </el-form-item>
                       </div>
                     </el-form-item>
@@ -273,14 +243,15 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :xs="24" :sm="12" :lg="6" v-if="examine === ''" >
-                  <el-form-item label="资料状态 " prop="dataStates">
-                    <el-select v-model="screenForm.dataStates" clearable style="width: 100%" multiple placeholder="请选择资料状态 ">
-                      <el-option v-for="item in dataStatesArr" :key="item.value" :label="item.label"
-                        :value="item.value" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6" v-if="examine === ''">
+                    <el-form-item label="资料状态 " prop="dataStates">
+                      <el-select v-model="screenForm.dataStates" clearable style="width: 100%" multiple
+                        placeholder="请选择资料状态 ">
+                        <el-option v-for="item in dataStatesArr" :key="item.value" :label="item.label"
+                          :value="item.value" />
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
                   <!-- <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="产品编码" >
                       <div class="fanwei">
@@ -352,7 +323,7 @@
                 <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
                 <el-tag size="mini" v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
                 <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
-    
+
               </template>
             </el-table-column>
             <el-table-column align="left" label="资料状态" prop="dataState" min-width="160" show-overflow-tooltip>
@@ -498,7 +469,7 @@
                 <!-- <el-button type="text" class="textColor"
                   v-if="(scope.row.examineStatus == 'OK' ||scope.row.examineStatus == 'AMEND') && isCustomer"
                   @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)"
                   @click="reexamineClick(scope.row.depositManageId)">复核</el-button>
 
@@ -507,9 +478,9 @@
                   scope.row.examineStatus == 'OK' ||
                   scope.row.examineStatus == 'FAIL' ||
                   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>
               </template>
             </el-table-column>
@@ -523,9 +494,9 @@
         </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" />
   </div>
 </template>
@@ -590,11 +561,11 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
-        settlementStatus:'',mailFactoryStatus:'',
-        endOrderDate:'',
-        startOrderDate:'',
-        dataStates:[],
-        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',endMailFactoryDate:'',startMailFactoryDate:''
+        settlementStatus: '', mailFactoryStatus: '',
+        endOrderDate: '',
+        startOrderDate: '',
+        dataStates: [],
+        startInstallTime: '', endInstallTime: '', startSettlementDate: '', endSettlementDate: '', endMailFactoryDate: '', startMailFactoryDate: ''
       }, // 搜索表单
       refundDepositArr: [
         {
@@ -629,8 +600,8 @@ export default {
           value: 'CLOSE'
         }
       ],
-      dataStatesArr:[
-      {
+      dataStatesArr: [
+        {
           label: '正常',
           value: 'NORMAL'
         },
@@ -681,11 +652,11 @@ export default {
     })
   },
   methods: {
-    replenishClick(id){
+    replenishClick(id) {
       this.detailId = id
       this.showSurrender = 2
     },
-    reexamineClick(id){
+    reexamineClick(id) {
       this.detailId = id
       this.showSurrender = 3
     },
@@ -730,8 +701,8 @@ export default {
     // 打开 批量审批
     batchExamine() {
       if (this.selectData.length) {
-      this.submitExamineForm()
-      // this.isShowExamineDialog = true;
+        this.submitExamineForm()
+        // this.isShowExamineDialog = true;
         return
       }
       this.$errorMsg('请选择')
@@ -894,7 +865,7 @@ export default {
     // 切换radio
     changeRadioFn(v) {
       if (!v) {
-        this.screenForm.dataStates= []
+        this.screenForm.dataStates = []
       }
       this.examine = v
       this.getDataList({
@@ -959,14 +930,22 @@ export default {
       this.showSurrender = 1
     },
     async getDataList(data) {
+      let status = null
+      if (this.examine == 'AMEND' || this.examine == 'WAIT_REVIEW' || this.examine == 'REVIEW') {
+        status = 'OK'
+      }
+      data.examineStatus = status ? status : this.examine
+      data.dataStates=this.screenForm.dataStates.join(',')
       getDepositCountList({
         enginOrderType: this.enginOrderType,
         ...this.screenForm,
-        examineStatus:this.examine,
+        dataStates:this.screenForm.dataStates.join(','),
+        examineStatus: status ? status : this.examine,
       }).then(res => {
         if (res.data) {
           this.numSum = res.data
         }
+        status = null
       })
       const res = await getDepositManageList(data)
       res.data.records.forEach(item => {