Explorar el Código

Merge commit '69bd2612ae411f1440bfb17a56eb1d763ad280f4' into HEAD

gitadmin hace 4 meses
padre
commit
271cccf899

+ 8 - 0
src/api/dealerBizParam.js

@@ -19,3 +19,11 @@ export const updateMallParam = (params) => {
     method: 'post'
   })
 }
+// 修改支付状态
+export const updatePayOpenParam = (params) => {
+  return axios({
+    url: '/dealerBizParam/updatePayOpenParam',
+    data: params,
+    method: 'post'
+  })
+}

+ 18 - 11
src/components/Select/index.js

@@ -29,21 +29,28 @@ export default {
     isEnable: { // 是否只获取已启用的数据
       type: Boolean,
       default: false
+    },
+    list:{
+      type: Array,
+      default: () => []
     }
   }),
   created () {
     const _this = this
-    // console.log(_this.code, '_this.code')
-    getLookUpData({
-      pageNo: 1,
-      pageSize: 1000,
-      lookupCode: _this.code,
-      isEnable: _this.isEnable ? 1 : undefined
-    }).then(res => {
-      if (res.status == 200) {
-        _this.dataList = res.data.list
-      }
-    })
+    if(this.list.length==0){
+      getLookUpData({
+        pageNo: 1,
+        pageSize: 1000,
+        lookupCode: _this.code,
+        isEnable: _this.isEnable ? 1 : undefined
+      }).then(res => {
+        if (res.status == 200) {
+          _this.dataList = res.data.list
+        }
+      })
+    }else{
+      _this.dataList = this.list
+    }
   },
   methods: {
 

+ 61 - 13
src/views/numsGoodsShelves/shoppingSwitch/list.vue

@@ -7,7 +7,6 @@
           <a-row :gutter="15">
             <a-col :md="6" :sm="24">
               <a-form-item label="经销商名称">
-                <!-- <storeList ref="storeList" @change="custChange"></storeList> -->
                 <a-input allowClear placeholder="请输入经销商名称" v-model.tirm="queryParam.dealerName"/>
               </a-form-item>
             </a-col>
@@ -22,6 +21,17 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="支付状态">
+                <v-select
+                  v-model="queryParam.payOpenFlag"
+                  ref="payOpenFlag"
+                  id="approveStore-payOpenFlag"
+                  :list="payStatusList"
+                  placeholder="请选择支付状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :md="6" :sm="24">
               <div>
                 <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="approveStore-refresh">查询</a-button>
@@ -37,7 +47,7 @@
         ref="table"
         :style="{ height: tableHeight+84.5+'px' }"
         size="small"
-        :rowKey="(record) => record.id"
+        :rowKey="(record) => record.wait_audit"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
@@ -45,7 +55,15 @@
         bordered>
         <!-- 商城状态-->
         <template slot="statusVal" slot-scope="text, record">
-          <a-switch checked-children="开启" un-checked-children="关闭" v-model="record.statusFlag" @change="e=>handleStatus(e,record)"/>
+          <a-switch checked-children="已开启" un-checked-children="已关闭" v-model="record.statusFlag" @change="e=>handleStatus(e,record)"/>
+        </template>
+        <!-- 支付状态-->
+        <template slot="payVal" slot-scope="text, record">
+          <span v-if="record.payOpenFlag=='wait_audit'">{{ payStatus(record.payOpenFlag) }}</span>
+          <a-button size="small" type="link" v-if="record.payOpenFlag=='wait_open'" @click="e=>handlePayStatus(e,record)">申请开通</a-button>
+          <div v-if="record.payOpenFlag=='pay_opened'||record.payOpenFlag=='pay_close'">
+            <a-switch checked-children="已开启" un-checked-children="已关闭" v-model="record.payFlag" @change="e=>handlePayStatus(e,record)"/>
+          </div>
         </template>
       </s-table>
     </a-spin>
@@ -55,11 +73,10 @@
 <script>
 // 组件
 import { STable, VSelect } from '@/components'
-import storeList from '@/views/common/storeList.vue'
 // 接口
-import { findMallParamList, updateMallParam } from '@/api/dealerBizParam'
+import { findMallParamList, updateMallParam, updatePayOpenParam } from '@/api/dealerBizParam'
 export default {
-  components: { STable, VSelect, storeList },
+  components: { STable, VSelect },
   data () {
     return {
       spinning: false,
@@ -69,14 +86,17 @@ export default {
       queryParam: {
         dealerName: undefined, // 经销商名称
         delearSn: undefined,
-        openFlag: undefined// 商城状态
+        openFlag: undefined, // 商城状态
+        payOpenFlag: undefined// 支付状态
       },
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '经销商名称', dataIndex: 'dealerName', width: '40%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '最后操作时间', dataIndex: 'updateDate', width: '35%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '商城状态', dataIndex: 'paramValue', width: '20%', align: 'center', scopedSlots: { customRender: 'statusVal' } }
+        { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
+        { title: '经销商名称', dataIndex: 'dealerName', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '商城状态时间', dataIndex: 'updateDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '商城状态', dataIndex: 'paramValue', width: '15%', align: 'center', scopedSlots: { customRender: 'statusVal' } },
+        { title: '支付状态时间', dataIndex: 'payOpenActDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '支付状态', dataIndex: 'payOpenFlag', width: '15%', align: 'center', scopedSlots: { customRender: 'payVal' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -90,16 +110,27 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               data.list[i].statusFlag = data.list[i].paramValue == '1'
+              data.list[i].payFlag = data.list[i].payOpenFlag == 'pay_opened'
             }
             this.disabled = false
           }
           this.spinning = false
           return data
         })
-      }
+      },
+      payStatusList: [
+        { code: 'pay_opened', dispName: '已开通' },
+        { code: 'wait_open', dispName: '待开通' },
+        { code: 'wait_audit', dispName: '审核中' },
+        { code: 'pay_close', dispName: '已关闭' }
+      ]
     }
   },
   methods: {
+    payStatus (val) {
+      const row = this.payStatusList.find(item => item.code == val)
+      return row ? row.dispName : '--'
+    },
     custChange (val) {
       if (val) {
         this.queryParam.delearSn = val.key
@@ -126,12 +157,29 @@ export default {
         }
       })
     },
+    // 修改支付开通状态
+    handlePayStatus (val, row) {
+      const _this = this
+      _this.spinning = true
+      updatePayOpenParam({
+        tenantId: row.tenantId,
+        paramValue: row.payOpenFlag == 'wait_open' ? 'wait_audit' : (row.payOpenFlag == 'pay_close' ? 'pay_opened' : 'pay_close')
+      }).then(res => {
+        if (res.status == 200) {
+          _this.$message.success(res.message)
+          _this.$refs.table.refresh()
+          _this.spinning = false
+        } else {
+          _this.spinning = false
+        }
+      })
+    },
     // 重置
     resetSearchForm () {
       this.queryParam.dealerName = undefined
       this.queryParam.delearSn = undefined
       this.queryParam.openFlag = undefined
-      this.$refs.storeList.resetForm()
+      this.queryParam.payOpenFlag = undefined
       this.$refs.table.refresh(true)
     },
     setTableH () {

+ 2 - 2
vue.config.js

@@ -108,8 +108,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.215:8501/qpls-it',
-        target: 'http://p.it.360arrow.com/qpls-it',
+        target: 'http://192.168.2.103:8501/qpls-it',
+        // target: 'http://p.it.360arrow.com/qpls-it',
         ws: false,
         changeOrigin: true,
         pathRewrite: {