lilei 11 months ago
parent
commit
22b08f419c

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/common/productBrand.js

@@ -11,7 +11,7 @@ const ProductBrand = {
         option-filter-prop="children"
         :dropdownMatchSelectWidth="false"
         :filter-option="filterOption">
-        <a-select-option v-for="item in productBrandList" :pinyin="item.pinyin" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
+        <a-select-option v-for="item in productBrandList" :id="item.brandSn+'-'+id" :pinyin="item.pinyin" :key="item.brandSn" :value="item.brandSn">{{ item.brandName }}</a-select-option>
       </a-select>
     `,
   props: {

+ 6 - 0
src/views/common/rangeDate.vue

@@ -3,6 +3,7 @@
     <div style="flex:1">
       <a-date-picker
         :size="size"
+        :id="id+'-startDate'"
         :locale="locale"
         v-model="startValue"
         :allowClear="allowClear"
@@ -31,6 +32,7 @@
     <div style="flex:1">
       <a-date-picker
         :size="size"
+        :id="id+'-endDate'"
         :locale="locale"
         v-model="endValue"
         :allowClear="allowClear"
@@ -62,6 +64,10 @@ import locale from 'ant-design-vue/es/date-picker/locale/zh_CN'
 import moment from 'moment'// 引入moment
 export default {
   props: {
+    id: {
+      type: String,
+      default: ''
+    },
     value: {
       type: Array,
       default: () => {

+ 5 - 0
src/views/common/rangeDateOld.vue

@@ -1,6 +1,7 @@
 <template>
   <a-range-picker
     style="width:100%"
+    :id="id"
     :ranges="ranges"
     :value="date"
     :size="size"
@@ -21,6 +22,10 @@ export default {
         return []
       }
     },
+    id: {
+      type: String,
+      default: ''
+    },
     size: {
       type: String,
       default: 'default'

+ 6 - 1
src/views/common/selectCust.vue

@@ -3,6 +3,7 @@
     show-search
     label-in-value
     :size="size"
+    :id="id"
     :value="dealerName"
     placeholder="请输入客户名称搜索"
     style="width: 100%"
@@ -15,7 +16,7 @@
     allowClear
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerSn" :disabled="isValidateEnabled ? item.enabledFlag=='0' : false">
+    <a-select-option v-for="item in data" :id="item.customerSn+'-'+id" :key="item.customerSn" :value="item.customerSn" :disabled="isValidateEnabled ? item.enabledFlag=='0' : false">
       {{ item.customerName }}
       <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
     </a-select-option>
@@ -30,6 +31,10 @@ export default {
       type: Boolean,
       default: false
     },
+    id: {
+      type: String,
+      default: ''
+    },
     size: {
       type: String,
       default: 'default'

+ 4 - 4
src/views/common/selectPrint.vue

@@ -13,8 +13,8 @@
     <a-spin :spinning="spinning" tip="Loading...">
       <div class="common-main" v-if="printList&&printList.length">
         <p style="color: #666;">选择打印机后,针式打印以后就会按这里设置的打印机去打印。<br>所以请正确选择打印机,如果选择错误,可以在顶部栏“设置”里面修改打印机。</p>
-        <a-select v-model="printIndex" @change="changePrint" style="width: 100%" placeholder="选择打印机">
-          <a-select-option v-for="item in printList" :key="'print-'+item.value" :value="item.name">
+        <a-select v-model="printIndex" @change="changePrint" style="width: 100%" id="print-options" placeholder="选择打印机">
+          <a-select-option v-for="item in printList" :id="'print-'+item.value" :key="'print-'+item.value" :value="item.name">
             {{ item.name }}
           </a-select-option>
         </a-select>
@@ -23,8 +23,8 @@
         <p>暂未发现打印机,请检查您的打印机是否连接正常</p>
       </div>
       <div class="btn-box">
-        <a-button type="default" style="margin-right:20px;" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" v-if="printList&&printList.length" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button type="default" id="print-cancel" style="margin-right:20px;" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button type="primary" id="print-ok" v-if="printList&&printList.length" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
     </a-spin>
   </a-modal>

+ 22 - 6
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -46,10 +46,22 @@
       <div class="table-operator">
         <a-row :gutter="16">
           <a-col class="gutter-row" :span="24">
-            <a-button type="primary" :loading="loading" ghost v-if="modes=='pages'" @click="deleteMore">
+            <a-button
+              id="shoppingCar-deleteMore"
+              type="primary"
+              :loading="loading"
+              ghost
+              v-if="modes=='pages'"
+              @click="deleteMore">
               批量删除
             </a-button>
-            <a-button type="primary" :loading="loading" ghost v-if="modes=='modals'" @click="addMore">
+            <a-button
+              id="shoppingCar-addMore"
+              type="primary"
+              :loading="loading"
+              ghost
+              v-if="modes=='modals'"
+              @click="addMore">
               批量添加
             </a-button>
             <span style="font-weight: bold;margin-left:15px;" v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length">已选 {{ rowSelectionInfo.selectedRowKeys.length }} 项</span>
@@ -77,6 +89,7 @@
       <template slot="purchaseQty" slot-scope="text, record">
         <a-input-number
           size="small"
+          :id="'shoppingCar-qty-'+record.productSn"
           v-model="record.qty"
           :precision="0"
           :min="1"
@@ -118,11 +131,11 @@ export default {
   components: { STable, VSelect, ProductType, ProductBrand },
   mixins: [commonMixin],
   props: {
-    modes: {
+    modes: { // 页面显示方式,页面 or 弹框
       type: String,
       default: 'pages'
     },
-    purchaseType: {
+    purchaseType: { // 采购类型
       type: String,
       default: null
     }
@@ -140,7 +153,7 @@ export default {
         productTypeSn1: '', //  产品一级分类
         productTypeSn2: '', //  产品二级分类
         productTypeSn3: '', //  产品三级分类
-        onlineFalg: undefined
+        onlineFalg: undefined // 是否上线
       },
       paramsData: null,
       openEditPriceModal: false, // 自定义报价弹窗
@@ -165,7 +178,7 @@ export default {
           return data
         })
       },
-      rowSelectionInfo: null
+      rowSelectionInfo: null // 已勾选数据
     }
   },
   methods: {
@@ -321,6 +334,7 @@ export default {
         }
       })
     },
+    // 确定添加
     confirmFun (content, params) {
       const _this = this
       this.$confirm({
@@ -350,12 +364,14 @@ export default {
         }
       })
     },
+    // 页面初始化
     pageInit (paramsData) {
       this.paramsData = paramsData || {}
       this.getColumns()
       this.setTableH()
       this.resetSearchForm()
     },
+    // 计算表格高度
     setTableH () {
       this.$nextTick(() => { // 页面渲染完成后的回调
         const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 4 - 5
src/views/storeManagement/bind/editModal.vue

@@ -20,10 +20,10 @@
           :wrapper-col="formItemLayout.wrapperCol"
         >
           <a-form-model-item label="选择中心店" prop="orgSn">
-            <orgList ref="orgList" :disabled="itemSn?itemSn:''" @change="orgChange" />
+            <orgList ref="orgList" id="bindEdit-org" :disabled="itemSn?itemSn:''" @change="orgChange" />
           </a-form-model-item>
           <a-form-model-item label="选择配送店" prop="childSnList">
-            <orgMultipleList ref="orgMultipleList" :disabled="itemSn?itemSn:form.orgSn" :params="{ sn: form.orgSn }" @change="orgMultipleChange" />
+            <orgMultipleList ref="orgMultipleList" id="bindEdit-child" :disabled="itemSn?itemSn:form.orgSn" :params="{ sn: form.orgSn }" @change="orgMultipleChange" />
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
@@ -68,8 +68,8 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        orgSn: undefined,
-        childSnList: undefined
+        orgSn: undefined, // 中心店
+        childSnList: undefined // 配送店
       },
       rules: {
         orgSn: [ { required: true, message: '请选择中心店', trigger: 'change' } ],
@@ -119,7 +119,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 5 - 4
src/views/storeManagement/bind/list.vue

@@ -33,6 +33,7 @@
         :style="{ height: tableHeight+84.5+'px' }"
         size="small"
         :rowKey="(record) => record.orgSn"
+        rowKeyName="orgSn"
         :columns="columns"
         :data="loadData"
         :scroll="{ y: tableHeight }"
@@ -46,14 +47,14 @@
             class="button-primary"
             @click="handleEdit(record)"
             v-if="$hasPermissions('B_storeManagementBind_edit')"
-            id="bindList-edit-btn">编辑</a-button>
+            :id="'bindList-edit-'+record.orgSn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             v-if="$hasPermissions('B_storeManagementBind_del')"
-            id="bindList-del-btn">删除</a-button>
+            :id="'bindList-del-'+record.orgSn">删除</a-button>
           <span v-if="!$hasPermissions('B_storeManagementBind_edit') &&!$hasPermissions('B_storeManagementBind_del')">--</span>
         </template>
       </s-table>
@@ -76,8 +77,8 @@ export default {
     return {
       spinning: false,
       queryParam: { //  查询条件
-        orgName: '',
-        childName: ''
+        orgName: '', // 中心店名称
+        childName: '' // 已绑配送店
       },
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作

+ 2 - 1
src/views/storeManagement/bind/orgList.vue

@@ -10,9 +10,10 @@
     :disabled="disabled?true:false"
     @search="fetchUser"
     @change="handleChange"
+    id="orglist-input"
     allowClear>
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.sn" :value="item.sn" :disabled="item.status=='0'">
+    <a-select-option v-for="item in data" :id="'orglist-'+item.sn" :key="item.sn" :value="item.sn" :disabled="item.status=='0'">
       {{ item.name }}
     </a-select-option>
   </a-select>

+ 2 - 1
src/views/storeManagement/bind/orgMultipleList.vue

@@ -11,10 +11,11 @@
     :disabled="!disabled?true:false"
     @search="fetchUser"
     @change="handleChange"
+    id="orglist-input"
     allowClear
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.sn" :value="item.sn" :disabled="disabled==item.sn || item.status=='0'">
+    <a-select-option v-for="item in data" :id="'orglist-'+item.sn" :key="item.sn" :value="item.sn" :disabled="disabled==item.sn || item.status=='0'">
       {{ item.name }}
     </a-select-option>
   </a-select>

+ 10 - 10
src/views/storeManagement/userAuthorization/editModal.vue

@@ -22,7 +22,7 @@
           <a-form-model-item label="选择中心店" prop="ownerOrgSn">
             <a-select
               placeholder="请选择中心店"
-              id="productInfoList-ownerOrgSn"
+              id="userAuth-ownerOrgSn"
               allowClear
               v-model="form.ownerOrgSn"
               :disabled="itemSn?true:false"
@@ -36,7 +36,7 @@
           <a-form-model-item label="选择授权账号" prop="userSn">
             <a-select
               placeholder="请选择授权账号"
-              id="productInfoList-userSn"
+              id="userAuth-userSn"
               allowClear
               v-model="form.userSn"
               :disabled="itemSn?true:false"
@@ -49,7 +49,7 @@
           <a-form-model-item label="选择配送店" prop="orgSnList">
             <a-select
               placeholder="请选择配送店"
-              id="productInfoList-orgSnList"
+              id="userAuth-orgSnList"
               allowClear
               v-model="form.orgSnList"
               mode="multiple"
@@ -95,18 +95,18 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        ownerOrgSn: undefined,
-        userSn: undefined,
-        orgSnList: undefined
+        ownerOrgSn: undefined, // 中心店
+        userSn: undefined, // 授权账号
+        orgSnList: undefined // 配送店
       },
       rules: {
         ownerOrgSn: [ { required: true, message: '请选择中心店', trigger: 'change' } ],
         userSn: [ { required: true, message: '请选择授权账号', trigger: 'change' } ],
         orgSnList: [ { required: true, message: '请选择配送店', trigger: 'change' } ]
       },
-      orgList: [],
-      userList: [],
-      childList: []
+      orgList: [], // 中心店下拉
+      userList: [], // 授权账户 下拉
+      childList: [] // 配送店 下拉
     }
   },
   methods: {
@@ -115,6 +115,7 @@ export default {
       this.getUserList()
       this.getChildList()
     },
+    // 按名称筛选
     filterOption (input, option) {
       return (
         option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
@@ -157,7 +158,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 5 - 5
src/views/storeManagement/userAuthorization/list.vue

@@ -55,14 +55,14 @@
             class="button-primary"
             @click="handleEdit(record)"
             v-if="$hasPermissions('B_storeManagementUserAuth_edit')"
-            id="userAuthList-edit-btn">编辑</a-button>
+            :id="'userAuthList-edit-'+record.userSn">编辑</a-button>
           <a-button
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
             v-if="$hasPermissions('B_storeManagementUserAuth_del')"
-            id="userAuthList-del-btn">删除</a-button>
+            :id="'userAuthList-del-'+record.userSn">删除</a-button>
           <span v-if="!$hasPermissions('B_storeManagementUserAuth_edit') && !$hasPermissions('B_storeManagementUserAuth_del')">--</span>
         </template>
       </s-table>
@@ -85,9 +85,9 @@ export default {
     return {
       spinning: false,
       queryParam: { //  查询条件
-        ownerOrgName: '',
-        userQueryWord: '',
-        orgName: ''
+        ownerOrgName: '', // 中心店名称
+        userQueryWord: '', // 中心店授权账号
+        orgName: ''// 配送店
       },
       tableHeight: 0,
       disabled: false, //  查询、重置按钮是否可操作