fix:政策列表

src/api/supply/pickup.js

@@ -1,7 +1,7 @@
 import request, { postBlob, handleImport, getBlob } from '@/utils/request'
 
 // 提货-列表V2
-export function pickListV2(data) {
+export function getPickupListV2(data) {
   return request({
     url: `/pick/listV2?moduleId=${data.moduleId}`,
     method: 'post',

src/views/supply/pickup/sum_list.vue

@@ -107,7 +107,7 @@ export default {
             value: val
           }
         ]
-        this.$refs.pageRef.refreshList()
+        // this.$refs.pageRef.refreshList()
       }
     }
   },
@@ -120,7 +120,7 @@ export default {
           value: this.$route.query.id
         }
       ]
-      this.$refs.pageRef.refreshList()
+      // this.$refs.pageRef.refreshList()
     } else {
       this.screenForm.orderNum = ''
     }
@@ -129,6 +129,7 @@ export default {
     // 列表请求函数
     getList(...p) {
       this.recordSelected = []
+      console.log(getPickupListV2, 99)
       return getPickupListV2(...p)
     },
     // 列表导出函数

src/views/supply/policy/policy_list.vue

@@ -78,7 +78,7 @@ export default {
           [
             {
               name: '批量审批',
-              click: ()=>{
+              click: () => {
                 this.batchExamine()
               },
               isRole: this.$checkBtnRole('examine', this.$route.meta.roles)
@@ -183,70 +183,60 @@ export default {
     },
     operation() {
       return (h, { row, index, column }) => {
-        const statusData = JSON.parse("{\"FAIL_ONE\":\"初审不通过\",\"REJECT\":\"驳回\",\"OK_ONE_AND_CONFIRM\":\"已确认未复核\",\"ABANDON\":\"弃审\",\"SAVE\":\"保存\",\"CLOSE\":\"关闭\",\"OK\":\"审核通过\",\"WAIT\":\"待审核\",\"FAIL\":\"审核不通过\",\"OK_ONE\":\"初审通过\"}")
+        const statusData = JSON.parse(
+          '{"FAIL_ONE":"初审不通过","REJECT":"驳回","OK_ONE_AND_CONFIRM":"已确认未复核","ABANDON":"弃审","SAVE":"保存","CLOSE":"关闭","OK":"审核通过","WAIT":"待审核","FAIL":"审核不通过","OK_ONE":"初审通过"}'
+        )
         return (
           <div class="operation-btns">
             {row.examineStatus === statusData['SAVE'] ? (
-              <el-popconfirm style="margin-left: 10px" title="确定提审？" onOnConfirm={() => this.handleSubmit(row.id)}>
+              <el-popconfirm title="确定提审？" onOnConfirm={() => this.handleSubmit(row.id)}>
                 <el-button slot="reference" type="text">
                   提审
                 </el-button>
               </el-popconfirm>
             ) : null}
-            {row.examineStatus ==statusData['WAIT'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
-              <el-button style="margin-left: 10px" type="text" onClick={() => this.toExamine(row)}>
+            {row.examineStatus == statusData['WAIT'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
+              <el-button type="text" onClick={() => this.toExamine(row)}>
                 审核
               </el-button>
             ) : null}
             {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
-              <el-popconfirm
-                style="margin-left: 10px"
-                title="确定删除吗？"
-                onOnConfirm={() => this.handleDelete(row.id)}
-              >
+              <el-popconfirm title="确定删除吗？" onOnConfirm={() => this.handleDelete(row.id)}>
                 <el-button slot="reference" type="text">
                   删除
                 </el-button>
               </el-popconfirm>
             ) : null}
             {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('edit', this.$route.meta.roles) ? (
-              <el-button style="margin-left: 10px" type="text" onClick="toForm(row)">
+              <el-button type="text" onClick="toForm(row)">
                 编辑
               </el-button>
             ) : null}
             {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
-              <el-popconfirm
-                style="margin-left: 10px"
-                title="确定弃审吗？"
-                onOnConfirm={() => this.handleAbandon(row.id)}
-              >
+              <el-popconfirm title="确定弃审吗？" onOnConfirm={() => this.handleAbandon(row.id)}>
                 <el-button slot="reference" type="text">
                   弃审
                 </el-button>
               </el-popconfirm>
             ) : null}
             {row.examineStatus == statusData['WAIT'] && this.$checkBtnRole('apply', this.$route.meta.roles) ? (
-              <el-popconfirm style="margin-left: 10px" title="确定撤回？" onOnConfirm={() => this.handleCancel(row.id)}>
+              <el-popconfirm title="确定撤回？" onOnConfirm={() => this.handleCancel(row.id)}>
                 <el-button slot="reference" type="text">
                   撤回
                 </el-button>
               </el-popconfirm>
             ) : null}
-            <el-button style="margin-left: 10px" type="text" onClick={() => this.toDetail(row)}>
+            <el-button type="text" onClick={() => this.toDetail(row)}>
               详情
             </el-button>
 
             {row.examineStatus === statusData['OK'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
-              <el-button style="margin-left: 10px" type="text" onClick={() => this.toReturn(row)}>
+              <el-button type="text" onClick={() => this.toReturn(row)}>
                 退订
               </el-button>
             ) : null}
             {row.examineStatus === statusData['SAVE'] && this.$checkBtnRole('examine', this.$route.meta.roles) ? (
-              <el-popconfirm
-                style="margin-left: 10px"
-                title="确定关闭吗？"
-                onOnConfirm={() => this.handleClose(row.id)}
-              >
+              <el-popconfirm title="确定关闭吗？" onOnConfirm={() => this.handleClose(row.id)}>
                 <el-button slot="reference" type="text">
                   关闭
                 </el-button>

src/views/supply/retail/retail_list.vue

@@ -141,11 +141,7 @@ export default {
         return (
           <div class="operation-btns">
             {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
-              <el-popconfirm
-                style="margin-right: 10px"
-                title="确定申请吗？"
-                onOnConfirm={() => this.handleSubmit(row.id)}
-              >
+              <el-popconfirm title="确定申请吗？" onOnConfirm={() => this.handleSubmit(row.id)}>
                 <el-button slot="reference" type="text">
                   申请
                 </el-button>
@@ -153,22 +149,14 @@ export default {
             ) : null}
 
             {this.$checkBtnRole('apply', this.$route.meta.roles) && row.examineStatus === statusData['WAIT'] ? (
-              <el-popconfirm
-                style="margin-right: 10px"
-                title="确定撤回吗？"
-                onOnConfirm={() => this.handleWithdraw(row.id)}
-              >
+              <el-popconfirm title="确定撤回吗？" onOnConfirm={() => this.handleWithdraw(row.id)}>
                 <el-button slot="reference" type="text">
                   撤回
                 </el-button>
               </el-popconfirm>
             ) : null}
             {this.$checkBtnRole('examine', this.$route.meta.roles) && row.examineStatus === statusData['OK'] ? (
-              <el-popconfirm
-                style="margin-right: 10px"
-                title="确定弃审吗？"
-                onOnConfirm={() => this.handleAbandon(row.id)}
-              >
+              <el-popconfirm title="确定弃审吗？" onOnConfirm={() => this.handleAbandon(row.id)}>
                 <el-button slot="reference" type="text">
                   弃审
                 </el-button>
@@ -177,22 +165,14 @@ export default {
             {this.$checkBtnRole('examine', this.$route.meta.roles) &&
             !row.closeTime &&
             (row.examineStatus === statusData['SAVE'] || row.examineStatus === statusData['WAIT']) ? (
-              <el-popconfirm
-                style="margin-right: 10px"
-                title="确定关闭吗？"
-                onOnConfirm={() => this.handleClose(row.id)}
-              >
+              <el-popconfirm title="确定关闭吗？" onOnConfirm={() => this.handleClose(row.id)}>
                 <el-button slot="reference" type="text">
                   关闭
                 </el-button>
               </el-popconfirm>
             ) : null}
             {this.$checkBtnRole('del', this.$route.meta.roles) && row.examineStatus === statusData['SAVE'] ? (
-              <el-popconfirm
-                style="margin-right: 10px"
-                title="确定删除吗？"
-                onOnConfirm={() => this.handleDelete(row.id)}
-              >
+              <el-popconfirm title="确定删除吗？" onOnConfirm={() => this.handleDelete(row.id)}>
                 <el-button slot="reference" type="text" style="color: #f56c6c">
                   删除
                 </el-button>