lilei 11 月之前
父節點
當前提交
99b918b08e

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1720406092890
+  "version": 1720423024712
 }

+ 28 - 22
src/views/numsGoodsShelves/approveStore/authPass.vue

@@ -21,7 +21,7 @@
               <a-form-model-item label="门头照片" prop="storeImage">
                 <Upload
                   class="upload"
-                  id="noticeEdit-imgPaths"
+                  id="authPass-storeImage"
                   v-model="form.storeImage"
                   ref="storeImage"
                   :fileSize="10"
@@ -36,7 +36,7 @@
               <a-form-model-item label="营业执照" prop="licenseImage">
                 <Upload
                   class="upload"
-                  id="noticeEdit-imgPaths"
+                  id="authPass-licenseImage"
                   v-model="form.licenseImage"
                   ref="licenseImage"
                   :fileSize="10"
@@ -123,7 +123,7 @@
             </a-col>
             <a-col :span="12">
               <a-form-model-item label="关联客户" prop="customerSn">
-                <custList ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
+                <custList id="authPass-customerSn" ref="custList" :dealerFlag="0" :isEnabled="true" @change="custChange"></custList>
               </a-form-model-item>
             </a-col>
             <a-col :span="12" v-if="form.settleType == 'CREDIT'">
@@ -132,6 +132,7 @@
                   :min="100"
                   :max="9999999"
                   style="width:100%"
+                  id="authPass-creditLimit"
                   :precision="2"
                   v-model="form.creditLimit"
                   placeholder="请输入大于100的数字(最多允许两位小数)"></a-input-number>
@@ -142,7 +143,7 @@
                 <template slot="label">
                   <a-tooltip placement="top">
                     <template slot="title">
-                     不勾选则不显示价格,结算价:即易码通进货价。
+                      不勾选则不显示价格,结算价:即易码通进货价。
                     </template>
                     价格权限设置<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
                   </a-tooltip>
@@ -150,19 +151,19 @@
                 <a-checkbox-group v-model="showPrice">
                   <div style="display: flex;padding:10px 0;">
                     <div style="width: 80px;font-weight: bold;">货架产品:</div>
-                    <a-checkbox value="shelf_price_show">
+                    <a-checkbox value="shelf_price_show" id="authPass-shelf_price_show">
                       车主价
                     </a-checkbox>
-                    <a-checkbox value="shelf_cost_show">
+                    <a-checkbox value="shelf_cost_show" id="authPass-shelf_cost_show">
                       结算价
                     </a-checkbox>
                   </div>
                   <div style="display: flex;padding:10px 0;">
                     <div style="width: 80px;font-weight: bold;">非货架产品:</div>
-                    <a-checkbox value="non_shelf_price_show">
+                    <a-checkbox value="non_shelf_price_show" id="authPass-nonshelf_price_show">
                       车主价
                     </a-checkbox>
-                    <a-checkbox value="non_shelf_cost_show">
+                    <a-checkbox value="non_shelf_cost_show" id="authPass-nonshelf_cost_show">
                       结算价
                     </a-checkbox>
                   </div>
@@ -182,8 +183,9 @@
 <script>
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect, Upload } from '@/components'
-import { getAreaCgj } from '@/api/data'
 import custList from '@/views/common/custList.vue'
+// 接口
+import { getAreaCgj } from '@/api/data'
 import { xprhStoreApplyDetail, xprhStoreApplyAudit } from '@/api/approveStore'
 import { updateShelfPriceShow } from '@/api/shelf'
 export default {
@@ -217,7 +219,7 @@ export default {
         applySn: undefined,
         auditStatus: 'PASS' // 通过
       },
-      showPrice:['shelf_price_show','non_shelf_price_show'], // 价格显示
+      showPrice: ['shelf_price_show', 'non_shelf_price_show'], // 价格显示
       rules: {
         storeImage: [{ required: true, message: '请上传门头照片', trigger: 'change' }],
         storeName: [{ required: true, message: '请输入门店名称', trigger: 'change' }],
@@ -237,6 +239,7 @@ export default {
     }
   },
   methods: {
+    // 过滤空字符
     filterEmpty () {
       let str = this.form.storeName
       str = str.replace(/\ +/g, '')
@@ -248,18 +251,20 @@ export default {
     custChange (obj, row) {
       this.form.customerSn = row ? row.customerSn : undefined
     },
-    //  图片上传
+    //  门店图片上传
     changeImage1 (file) {
       this.form.storeImage = file
     },
+    // 删除门店图片
     removeImage1 () {
       this.form.storeImage = ''
       this.$refs.storeImage.setFileList('')
     },
-    //  图片上传
+    //  营业执照图片上传
     changeImage2 (file) {
       this.form.licenseImage = file
     },
+    // 删除营业执照图片
     removeImage2 () {
       this.form.licenseImage = ''
       this.$refs.licenseImage.setFileList('')
@@ -279,7 +284,7 @@ export default {
         }
       })
     },
-    //  保存
+    //  保存门店信息
     saveForm () {
       const _this = this
       _this.$refs.ruleForm.validate(valid => {
@@ -298,6 +303,7 @@ export default {
         }
       })
     },
+    // 提交门店数据
     handleSubmit (e) {
       const _this = this
       _this.spinning = true
@@ -306,15 +312,15 @@ export default {
           const shelfSn = res.data.shelfSn
           // 更新价格显示设置
           const priceStr = [
-            {paramCode: 'shelf_price_show',paramValue:0},
-            {paramCode: 'shelf_cost_show',paramValue:0},
-            {paramCode: 'non_shelf_price_show',paramValue:0},
-            {paramCode: 'non_shelf_cost_show',paramValue:0}
-            ]
+            { paramCode: 'shelf_price_show', paramValue: 0 },
+            { paramCode: 'shelf_cost_show', paramValue: 0 },
+            { paramCode: 'non_shelf_price_show', paramValue: 0 },
+            { paramCode: 'non_shelf_cost_show', paramValue: 0 }
+          ]
           priceStr.map(item => {
-             item.paramValue = _this.showPrice.includes(item.paramCode) ? 1 : 0
+            item.paramValue = _this.showPrice.includes(item.paramCode) ? 1 : 0
           })
-          // 更新价格显示
+          // 保存价格显示
           updateShelfPriceShow({
             shelfSn: shelfSn,
             paramValue: priceStr
@@ -329,7 +335,6 @@ export default {
               _this.spinning = false
             }
           })
-          
         } else {
           _this.spinning = false
         }
@@ -404,7 +409,9 @@ export default {
       this.getArea('province') //  省市区
       this.$refs.ruleForm.resetFields()
     },
+    // 初始页面
     initPage () {
+      // 获取审核信息
       this.getBaseData()
       //  编辑页
       if (this.$route.params.sn) {
@@ -413,7 +420,6 @@ export default {
     }
   },
   mounted () {
-    console.log('mounted')
     this.initPage()
   },
   beforeRouteEnter (to, from, next) {

+ 26 - 17
src/views/numsGoodsShelves/approveStore/list.vue

@@ -11,17 +11,17 @@
           <a-row :gutter="15">
             <a-col :md="4" :sm="24">
               <a-form-item label="联系人手机">
-                <a-input allowClear placeholder="请输入联系人手机" v-model.trim="queryParam.contactPhone"/>
+                <a-input id="approveStore-contactPhone" allowClear placeholder="请输入联系人手机" v-model.trim="queryParam.contactPhone"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
               <a-form-item label="联系人姓名">
-                <a-input allowClear placeholder="请输入联系人姓名" v-model.trim="queryParam.contactName"/>
+                <a-input id="approveStore-contactName" allowClear placeholder="请输入联系人姓名" v-model.trim="queryParam.contactName"/>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="门店名称">
-                <a-input allowClear placeholder="请输入门店名称" v-model.trim="queryParam.storeName"/>
+                <a-input id="approveStore-storeName" allowClear placeholder="请输入门店名称" v-model.trim="queryParam.storeName"/>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -58,15 +58,21 @@
         bordered>
         <!-- 货架名称 -->
         <template slot="storeName" slot-scope="text, record">
-           {{record.storeName}}
-           <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='WRITE_OFF'"></a-badge>
-           <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='DISABLED'"></a-badge>
-           <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='SUSPEND'"></a-badge>
+          {{ record.storeName }}
+          <a-badge count="已注销" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='WRITE_OFF'"></a-badge>
+          <a-badge count="已停用" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='DISABLED'"></a-badge>
+          <a-badge count="已暂停" :number-style="{ zoom:'80%',marginLeft:'5px', color: '#fff',background:'#999' }" v-if="record.state=='SUSPEND'"></a-badge>
         </template>
         <!-- 图片 -->
         <template slot="imageUrl" slot-scope="text, record">
           <div v-if="text&&text.length">
-            <img :src="text" width="30" height="30" class="imageUrl" @click="inited([text])" />
+            <img
+              :src="text"
+              width="30"
+              height="30"
+              :id="'aprove-viewimg-'+record.id"
+              class="imageUrl"
+              @click="inited([text])" />
           </div>
           <span v-else>--</span>
         </template>
@@ -81,8 +87,8 @@
         <!-- 操作 -->
         <template slot="action" slot-scope="text, record">
           <div v-if="record.auditStatus == 'WAIT'">
-            <a-button size="small" type="link" class="button-primary" @click="handleAudit(record,1)">通过</a-button>
-            <a-button size="small" type="link" class="button-primary" @click="handleAudit(record,0)">不通过</a-button>
+            <a-button :id="'aprove-pass-'+record.id" size="small" type="link" class="button-primary" @click="handleAudit(record,1)">通过</a-button>
+            <a-button :id="'aprove-noPass-'+record.id" size="small" type="link" class="button-primary" @click="handleAudit(record,0)">不通过</a-button>
           </div>
           <span v-else>--</span>
         </template>
@@ -105,10 +111,10 @@ export default {
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作
       queryParam: {
-        contactName: '',
-        contactPhone: '',
-        storeName: '',
-        auditStatus: undefined
+        contactName: '', // 联系人姓名
+        contactPhone: '', // 联系人电话
+        storeName: '', //
+        auditStatus: undefined // 审核状态
       },
       columns: [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
@@ -141,17 +147,17 @@ export default {
           this.spinning = false
           return data
         })
-      },
-      openModal: false,
-      nowData: null
+      }
     }
   },
   computed: {
     ...mapState({
+      // 邀请码
       dealerInviteCode: state => state.user.info.extInfo.dealer.dealerInviteCode
     })
   },
   methods: {
+    // 预览图片
     inited (viewer) {
       if (viewer.length) {
         this.$viewerApi({
@@ -165,6 +171,7 @@ export default {
       if (type == 1) {
         this.$router.push({ name: 'approveStoreAuthPass', params: { sn: row.applySn } })
       } else {
+        // 不通过
         const _this = this
         this.$confirm({
           title: '提示',
@@ -197,10 +204,12 @@ export default {
       this.queryParam.auditStatus = undefined
       this.$refs.table.refresh(true)
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 245
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 3 - 3
src/views/numsGoodsShelves/shelfSet/list.vue

@@ -72,7 +72,7 @@
             v-if="record.finishFlag!=undefined"
             @change="changeStatus(record)"
             :checked="record.finishFlag == 1"
-            id="shelfSetList-finishFlag"
+            :id="'shelfSetList-finishFlag-'+record.id"
           />
           <span v-else :style="{ color: record.finishFlag == 1 ? '#00aa00' : '#999' }">
             {{ record.finishFlag == 1 ? '是' : (record.finishFlag!=undefined?'否':'--') }}
@@ -87,7 +87,7 @@
             v-if="record.state!=undefined"
             @change="enableShelf(record)"
             :checked="record.state == 'ENABLE'"
-            id="shelfSetList-state"
+            :id="'shelfSetList-state-'+record.id"
           />
           <span v-else :style="{ color: record.state == 'ENABLE' ? '#00aa00' : '#999' }">
             {{ record.state == 'ENABLE' ? '启用' : (record.state!=undefined&&record.state!='WRITE_OFF'&&record.state!='SUSPEND'?'停用':'--') }}
@@ -98,7 +98,7 @@
           <div>
             <a-button id="shelfSetList-setView" size="small" type="link" class="button-primary" @click="handleSet(record)">{{ record.state!='WRITE_OFF'&&record.state!='SUSPEND'?'货架设置':'查看' }}</a-button>
             <a-button
-              id="shelfSetList-cancel"
+              :id="'shelfSetList-cancel-'+record.id"
               size="small"
               type="link"
               class="button-primary"

+ 5 - 5
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -129,7 +129,7 @@
           <!-- 操作 -->
           <template slot="action" slot-scope="text, record">
             <a-button
-              id="shelfSet-link"
+              :id="'shelfSet-link-'+record.id"
               size="small"
               type="link"
               :class="record.enableFlag==1?'button-error':'button-primary'"
@@ -137,7 +137,7 @@
               @click="handleEnable(record)"
             >{{ record.enableFlag==1?'禁用':'启用' }}</a-button>
             <a-button
-              id="shelfSet-bindProduct"
+              :id="'shelfSet-bindProduct-'+record.id"
               size="small"
               type="link"
               class="button-primary"
@@ -145,7 +145,7 @@
               @click="handleProduct(record, 'bind')"
             >绑定产品</a-button>
             <a-button
-              id="shelfSet-editProduct"
+              :id="'shelfSet-editProduct-'+record.id"
               size="small"
               type="link"
               :class="record.enableFlag==1?'button-primary':''"
@@ -154,7 +154,7 @@
               @click="handleReplace(record)"
             >更换产品</a-button>
             <a-button
-              id="shelfSet-editHw"
+              :id="'shelfSet-editHw-'+record.id"
               size="small"
               type="link"
               :class="record.enableFlag==1?'button-primary':''"
@@ -162,7 +162,7 @@
               @click="editHW(record)"
             >编辑</a-button>
             <a-button
-              id="shelfSet-del"
+              :id="'shelfSet-del-'+record.id"
               size="small"
               type="link"
               class="button-error"