押金管理

src/views/deposit_home/deposit_list.vue

@@ -352,6 +352,33 @@
                     </el-form-item>
                   </el-col>
                   <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="订单日期" style="margin-bottom: 0">
+                      <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-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-form-item>
+                      </div>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="入厂日期" style="margin-bottom: 0">
                       <div class="fanwei">
                         <el-form-item prop="startInFactoryDate">
@@ -379,6 +406,7 @@
                     </el-form-item>
                   </el-col>
 
+                  
                   <el-col :xs="24" :sm="12" :lg="6">
                     <el-form-item label="入厂类型" prop="inFactoryType">
                       <el-input v-model="screenForm.inFactoryType" placeholder="请输入入厂类型" />
@@ -699,6 +727,14 @@
 
               </template>
             </el-table-column>
+            <el-table-column align="left" label="资料状态" prop="dataState" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.dataState == 'NORMAL'" type="warning" size="small">正常</el-tag>
+                <el-tag v-if="scope.row.dataState == 'AMEND'" type="warning" size="small">补充</el-tag>
+                <el-tag v-if="scope.row.dataState == 'WAIT_REVIEW'" type="warning" size="small">待复核</el-tag>
+                <el-tag v-if="scope.row.dataState == 'REVIEW'" type="warning" size="small">复核</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
             <!-- <el-table-column
               align="right"
@@ -865,7 +901,9 @@ export default {
         endSettlementNo:'',
         inFactoryType: '',
         endMailFactoryDate:'',startMailFactoryDate:'',
-        settlementStatus:'',mailFactoryStatus:''
+        settlementStatus:'',mailFactoryStatus:'',
+        endOrderDate:'',
+        startOrderDate:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',

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">
@@ -69,17 +69,19 @@
                   <el-form-item label="是否退押 " prop="isRefundDeposit">
                     <el-select v-model="screenForm.isRefundDeposit" style="width: 100%" placeholder="请选择是否退押 ">
                       <el-option label="默认" :value="null" />
+
                       <el-option v-for="item in refundDepositArr" :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-col :xs="24" :sm="12" :lg="6" v-if="examine === ''">
                   <el-form-item label="状态 " prop="examineStatus">
-                    <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 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>
                   </el-form-item>
                 </el-col>
@@ -180,13 +182,23 @@
                     <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>
@@ -196,14 +208,51 @@
                       <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>
+                  </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6">
+                    <el-form-item label="订单日期" style="margin-bottom: 0">
+                      <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-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-form-item>
                       </div>
                     </el-form-item>
@@ -224,6 +273,14 @@
                       </el-select>
                     </el-form-item>
                   </el-col>
+                  <el-col :xs="24" :sm="12" :lg="6" >
+                  <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">
@@ -295,9 +352,15 @@
                 <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>
-                <el-tag v-show="row.examineStatus == 'AMEND'" type="warning" size="mini">补充</el-tag>
-                <el-tag v-show="row.examineStatus == 'WAIT_REVIEW'" type="warning" size="mini">待复核</el-tag>
-                <el-tag v-show="row.examineStatus == 'REVIEW'" type="warning" size="mini">复核</el-tag>
+    
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="资料状态" prop="dataState" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <el-tag v-if="scope.row.dataState == 'NORMAL'" type="warning" size="small">正常</el-tag>
+                <el-tag v-if="scope.row.dataState == 'AMEND'" type="warning" size="small">补充</el-tag>
+                <el-tag v-if="scope.row.dataState == 'WAIT_REVIEW'" type="warning" size="small">待复核</el-tag>
+                <el-tag v-if="scope.row.dataState == 'REVIEW'" type="warning" size="small">复核</el-tag>
               </template>
             </el-table-column>
             <el-table-column align="right" label="数量" prop="hasSendQty" min-width="60" show-overflow-tooltip />
@@ -435,7 +498,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>
 
@@ -444,9 +507,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>
@@ -460,9 +523,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>
@@ -489,35 +552,6 @@ export default {
     RefundReplenish,
     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() {
     return {
       importFileList: [],
@@ -526,7 +560,6 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-      examine: '',
       screenForm: {
         confirmName: '', // 审核人
         createName: '', // 创建人
@@ -534,7 +567,7 @@ export default {
         endDeliverTime: '', // 发货申请日期-结束
         enginOrderNo: '', // 工程订单编号
         enginOrderType: 'HOME', // 工程订单类型
-        examineStatus: [''], // 状态
+        examineStatus: '', // 状态
         refEnginRecordNo: '', // 登录单号
         refProjectName: '', // 项目名称
         refUseUnit: '', // 使用单位
@@ -557,9 +590,11 @@ export default {
         geLiInerNote: '',
         startFactoryNo: '',
         endFactoryNo: '',
-        settlementStatus: '', mailFactoryStatus: '',
-
-        startInstallTime: '', endInstallTime: '', startSettlementDate: '', endSettlementDate: '', endMailFactoryDate: '', startMailFactoryDate: ''
+        settlementStatus:'',mailFactoryStatus:'',
+        endOrderDate:'',
+        startOrderDate:'',
+        dataStates:[],
+        startInstallTime:'',endInstallTime:'',startSettlementDate:'',endSettlementDate:'',endMailFactoryDate:'',startMailFactoryDate:''
       }, // 搜索表单
       refundDepositArr: [
         {
@@ -574,10 +609,6 @@ export default {
       isCollapse: true,
       examineStatusArr: [
         {
-          label: '全部',
-          value: ''
-        },
-        {
           label: '保存',
           value: 'SAVE'
         },
@@ -596,9 +627,15 @@ export default {
         {
           label: '关闭',
           value: 'CLOSE'
+        }
+      ],
+      dataStatesArr:[
+      {
+          label: '正常',
+          value: 'NORMAL'
         },
         {
-          label: '保存（补充资料）',
+          label: '补充',
           value: 'AMEND'
         },
         {
@@ -611,6 +648,7 @@ export default {
         }
       ],
       listLoading: false, // 列表加载loading
+      examine: '',
       showSurrender: 0,
       detailId: '',
       selectData: [],
@@ -643,11 +681,11 @@ export default {
     })
   },
   methods: {
-    replenishClick(id) {
+    replenishClick(id){
       this.detailId = id
       this.showSurrender = 2
     },
-    reexamineClick(id) {
+    reexamineClick(id){
       this.detailId = id
       this.showSurrender = 3
     },
@@ -678,7 +716,7 @@ export default {
           // endDeliverTime: "",
           enginOrderNo: '',
           enginOrderType: this.enginOrderType,
-          examineStatus: [] || '',
+          examineStatus: '',
           refEnginRecordNo: '',
           refProjectName: '',
           refUseUnit: '',
@@ -692,8 +730,8 @@ export default {
     // 打开 批量审批
     batchExamine() {
       if (this.selectData.length) {
-        this.submitExamineForm()
-        // this.isShowExamineDialog = true;
+      this.submitExamineForm()
+      // this.isShowExamineDialog = true;
         return
       }
       this.$errorMsg('请选择')
@@ -745,7 +783,7 @@ export default {
           // endDeliverTime: "",
           enginOrderNo: '',
           enginOrderType: this.enginOrderType,
-          examineStatus: [] || '',
+          examineStatus: '',
           refEnginRecordNo: '',
           refProjectName: '',
           refUseUnit: '',
@@ -765,7 +803,7 @@ export default {
         // endDeliverTime: "",
         enginOrderNo: '',
         enginOrderType: this.enginOrderType,
-        examineStatus: [] || '',
+        examineStatus: '',
         refEnginRecordNo: '',
         refProjectName: '',
         refUseUnit: '',
@@ -855,9 +893,6 @@ export default {
     },
     // 切换radio
     changeRadioFn(v) {
-      console.log(v, 888);
-      this.screenForm.examineStatus.pop()
-      this.screenForm.examineStatus[0] = v
       this.examine = v
       this.getDataList({
         pageSize: this.pageSize,
@@ -910,10 +945,9 @@ export default {
         createName: '',
         enginOrderNo: '',
         enginOrderType: this.enginOrderType,
+        examineStatus: this.examine,
         refUseUnit: '',
-        ...this.screenForm,
-        examineStatus: this.screenForm.examineStatus.join(',') || '',
-
+        ...this.screenForm
       })
     },
     // 详情
@@ -924,9 +958,7 @@ export default {
     async getDataList(data) {
       getDepositCountList({
         enginOrderType: this.enginOrderType,
-        ...this.screenForm,
-        examineStatus: this.screenForm.examineStatus.join(',') || '',
-
+        ...this.screenForm
       }).then(res => {
         if (res.data) {
           this.numSum = res.data