lilei 11 tháng trước cách đây
mục cha
commit
5ece86ac61

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/common/auditModal.vue

@@ -16,8 +16,8 @@
         </div>
         </div>
       </div>
       </div>
       <div class="btn-box">
       <div class="btn-box">
-        <a-button type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
-        <a-button type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
+        <a-button id="audit-modal-nopass" type="primary" class="button-error" @click="handleAuditFail">审核不通过</a-button>
+        <a-button id="audit-modal-ok" type="primary" class="button-info" @click="handleAuditOk">审核通过</a-button>
       </div>
       </div>
     </a-spin>
     </a-spin>
   </a-modal>
   </a-modal>

+ 8 - 2
src/views/common/commonModal.vue

@@ -13,8 +13,14 @@
       <div class="common-main" v-html="modalHtml"></div>
       <div class="common-main" v-html="modalHtml"></div>
       <slot></slot>
       <slot></slot>
       <div class="btn-box">
       <div class="btn-box">
-        <a-button type="default" size="large" class="button-warning" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button type="primary" size="large" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
+        <a-button
+          id="common-modal-cancel"
+          type="default"
+          size="large"
+          class="button-warning"
+          @click="handleCommonCancel"
+          v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button id="common-modal-ok" type="primary" size="large" class="button-error" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
       </div>
     </a-spin>
     </a-spin>
   </a-modal>
   </a-modal>

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

@@ -2,6 +2,7 @@
   <a-select
   <a-select
     show-search
     show-search
     label-in-value
     label-in-value
+    :id="id"
     :size="size"
     :size="size"
     :value="dealerName"
     :value="dealerName"
     mode="combobox"
     mode="combobox"
@@ -16,7 +17,7 @@
     allowClear
     allowClear
   >
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerName" :disabled="(isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled?item.dealerFlag==1:false)">
+    <a-select-option v-for="item in data" :id="id+'-'+item.customerSn" :key="item.customerSn" :value="item.customerName" :disabled="(isValidateEnabled ? item.enabledFlag=='0' : false) || (dealerDisabled?item.dealerFlag==1:false)">
       {{ item.customerName }}
       {{ item.customerName }}
       <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
       <span v-if="isValidateEnabled && item.enabledFlag=='0'">(已禁用)</span>
     </a-select-option>
     </a-select-option>
@@ -31,6 +32,10 @@ export default {
       type: Boolean,
       type: Boolean,
       default: false
       default: false
     },
     },
+    id: {
+      type: String,
+      default: ''
+    },
     size: {
     size: {
       type: String,
       type: String,
       default: 'default'
       default: 'default'

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

@@ -4,6 +4,7 @@
     show-search
     show-search
     label-in-value
     label-in-value
     :value="dealerName"
     :value="dealerName"
+    :id="id"
     placeholder="请输入名称搜索"
     placeholder="请输入名称搜索"
     style="width: 100%"
     style="width: 100%"
     :filter-option="false"
     :filter-option="false"
@@ -14,7 +15,7 @@
     allowClear
     allowClear
   >
   >
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.customerSn" :value="item.customerSn">{{ item.customerName }}</a-select-option>
+    <a-select-option v-for="item in data" :id="id+'-'+item.customerSn" :key="item.customerSn" :value="item.customerSn">{{ item.customerName }}</a-select-option>
   </a-select>
   </a-select>
 </template>
 </template>
 <script>
 <script>
@@ -22,6 +23,10 @@ import debounce from 'lodash/debounce'
 import { custList } from '@/api/customer'
 import { custList } from '@/api/customer'
 export default {
 export default {
   props: {
   props: {
+    id: {
+      type: String,
+      default: ''
+    },
     verify: { //  当前输入客户名称是否是卫星仓客户 提示信息
     verify: { //  当前输入客户名称是否是卫星仓客户 提示信息
       type: Boolean,
       type: Boolean,
       default: false
       default: false

+ 6 - 0
src/views/common/editInput.js

@@ -6,6 +6,7 @@ const EditableCell = {
         </span>
         </span>
         <div class="editable-cell-input-wrapper">
         <div class="editable-cell-input-wrapper">
           <a-input-number 
           <a-input-number 
+          :id="id+'-number-input'"
           :size="size"
           :size="size"
           :min="min" 
           :min="min" 
           :max="max" 
           :max="max" 
@@ -16,6 +17,7 @@ const EditableCell = {
           @pressEnter="check"/>
           @pressEnter="check"/>
         </div>
         </div>
         <a-icon
         <a-icon
+          :id="id+'-number-input-check'"
           type="check"
           type="check"
           slot="suffix"
           slot="suffix"
           :title="editable?'保存':''"
           :title="editable?'保存':''"
@@ -25,6 +27,10 @@ const EditableCell = {
       </div>
       </div>
     `,
     `,
   props: {
   props: {
+    id: {
+          type: String,
+          default: ''
+        },
     text: Number,
     text: Number,
     precision: {
     precision: {
       type: [Number],
       type: [Number],

+ 3 - 3
src/views/common/outInDetialModal.vue

@@ -54,7 +54,7 @@ export default {
       type: Boolean,
       type: Boolean,
       default: false
       default: false
     },
     },
-    outBizType: {
+    outBizType: { // outBizType = SHOP_CALL_OUT(店内调出)   /  SALES (销售)
       type: String,
       type: String,
       default: ''
       default: ''
     }
     }
@@ -114,8 +114,8 @@ export default {
         // { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(5, 0, { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ?  _this.toThousands(text) : '--') } })
-        arr.splice(7, 0, { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ?  _this.toThousands(text) : '--') } })
+        arr.splice(5, 0, { title: '成本价', dataIndex: 'putCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '成本小计', dataIndex: 'totalCost', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       }
       return arr
       return arr
     }
     }

+ 14 - 8
src/views/common/pdfViewModal.vue

@@ -18,20 +18,26 @@
           <div>
           <div>
             调整比例:{{ Math.round(scalVal*100) }}%
             调整比例:{{ Math.round(scalVal*100) }}%
             <div>
             <div>
-              <a-button :disabled="scalLoading" style="margin-right: 10px;" size="small" @click="setScalVal(0)"><a-icon type="minus" /> 缩小</a-button>
-              <a-button :disabled="scalLoading" size="small" @click="setScalVal(1)"><a-icon type="plus" /> 放大</a-button>
+              <a-button id="xs-btn" :disabled="scalLoading" style="margin-right: 10px;" size="small" @click="setScalVal(0)"><a-icon type="minus" /> 缩小</a-button>
+              <a-button id="fd-btn" :disabled="scalLoading" size="small" @click="setScalVal(1)"><a-icon type="plus" /> 放大</a-button>
             </div>
             </div>
           </div>
           </div>
           <div>
           <div>
             <div v-if="hasClipboard">
             <div v-if="hasClipboard">
-              <a-button :disabled="scalLoading" size="small" @click="handleCapture('export')"><a-icon type="export" /> 导出图片</a-button>
+              <a-button id="export-btn" :disabled="scalLoading" size="small" @click="handleCapture('export')"><a-icon type="export" /> 导出图片</a-button>
             </div>
             </div>
           </div>
           </div>
           <div>
           <div>
             选择打印机:
             选择打印机:
             <div>
             <div>
-              <a-select size="small" style="width:200px;" v-model="printIndex" @change="changePrint" placeholder="选择打印机">
-                <a-select-option v-for="item in printList" :key="'print-'+item.value" :value="item.name">
+              <a-select
+                size="small"
+                id="print-opts"
+                style="width:200px;"
+                v-model="printIndex"
+                @change="changePrint"
+                placeholder="选择打印机">
+                <a-select-option v-for="item in printList" :id="'print-'+item.value" :key="'print-'+item.value" :value="item.name">
                   {{ item.name }}
                   {{ item.name }}
                 </a-select-option>
                 </a-select-option>
               </a-select>
               </a-select>
@@ -53,11 +59,11 @@
         </vue-scroll>
         </vue-scroll>
       </div>
       </div>
       <div class="btn-box">
       <div class="btn-box">
-        <a-button size="large" style="margin-right: 25px;" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
-        <a-button size="large" style="margin-right: 25px;" type="default" @click="handleCapture(hasClipboard?'copy':'export')">
+        <a-button id="print-view-cancel" size="large" style="margin-right: 25px;" @click="handleCommonCancel" v-if="isCancel">{{ cancelText }}</a-button>
+        <a-button id="print-view-copy" size="large" style="margin-right: 25px;" type="default" @click="handleCapture(hasClipboard?'copy':'export')">
           {{ hasClipboard?'复制截图':'导出图片' }}
           {{ hasClipboard?'复制截图':'导出图片' }}
         </a-button>
         </a-button>
-        <a-button size="large" type="primary" :loading="$store.state.app.printLoading" @click="handleCommonOk">
+        <a-button id="print-view-ok" size="large" type="primary" :loading="$store.state.app.printLoading" @click="handleCommonOk">
           {{ $store.state.app.printLoading?'打印中...':okText }}
           {{ $store.state.app.printLoading?'打印中...':okText }}
         </a-button>
         </a-button>
       </div>
       </div>

+ 2 - 2
src/views/common/print.vue

@@ -1,8 +1,8 @@
 <template>
 <template>
   <div class="print-page-header">
   <div class="print-page-header">
     <a-radio-group key="4" id="print-printerType" v-model="printerType">
     <a-radio-group key="4" id="print-printerType" v-model="printerType">
-      <a-radio value="NEEDLE">针式</a-radio>
-      <a-radio value="INK">喷墨</a-radio>
+      <a-radio value="NEEDLE" id="print-printerType1">针式</a-radio>
+      <a-radio value="INK" id="print-printerType0">喷墨</a-radio>
     </a-radio-group>
     </a-radio-group>
     <a-button key="3" id="print-preview-btn" :loading="$store.state.app.printLoading" :disabled="disabled" @click="handlePrint('preview')">打印预览</a-button>
     <a-button key="3" id="print-preview-btn" :loading="$store.state.app.printLoading" :disabled="disabled" @click="handlePrint('preview')">打印预览</a-button>
     <a-button
     <a-button

+ 3 - 3
src/views/common/printPanel.vue

@@ -5,8 +5,8 @@
         <div style="padding:10px;">
         <div style="padding:10px;">
           <span>打印方式:</span>
           <span>打印方式:</span>
           <a-radio-group key="4" id="print-printerType" v-model="printerType">
           <a-radio-group key="4" id="print-printerType" v-model="printerType">
-            <a-radio value="NEEDLE">针式</a-radio>
-            <a-radio value="INK">喷墨</a-radio>
+            <a-radio value="NEEDLE" id="print-printerType1">针式</a-radio>
+            <a-radio value="INK" id="print-printerType2">喷墨</a-radio>
           </a-radio-group>
           </a-radio-group>
         </div>
         </div>
         <slot name="extendCons"></slot>
         <slot name="extendCons"></slot>
@@ -46,7 +46,7 @@
           <slot name="extendButtons"></slot>
           <slot name="extendButtons"></slot>
         </div>
         </div>
       </template>
       </template>
-      <a-button type="link" class="button-default"><a-icon type="printer" /> 打印导出 </a-button>
+      <a-button type="link" class="button-default" id="print-export-btn"><a-icon type="printer" /> 打印导出 </a-button>
     </a-popover>
     </a-popover>
 
 
     <!-- 打印 -->
     <!-- 打印 -->

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

@@ -1,6 +1,7 @@
 <template>
 <template>
   <!-- 箭冠产品 -->
   <!-- 箭冠产品 -->
   <a-select
   <a-select
+    :id="id"
     show-search
     show-search
     label-in-value
     label-in-value
     :value="productCode"
     :value="productCode"
@@ -14,7 +15,7 @@
     @change="handleChange"
     @change="handleChange"
     allowClear>
     allowClear>
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
     <a-spin v-if="fetching" slot="notFoundContent" size="small" />
-    <a-select-option v-for="item in data" :key="item.productSn" :value="item.productSn">{{ item.code }}</a-select-option>
+    <a-select-option v-for="item in data" :id="item.productSn+'-'+id" :key="item.productSn" :value="item.productSn">{{ item.code }}</a-select-option>
   </a-select>
   </a-select>
 </template>
 </template>
 <script>
 <script>
@@ -23,6 +24,10 @@ import { shelfDealerProductList } from '@/api/shelf'
 import { productList } from '@/api/product'
 import { productList } from '@/api/product'
 export default {
 export default {
   props: {
   props: {
+    id: {
+      type: String,
+      default: ''
+    },
     itemSn: {
     itemSn: {
       type: String || Number,
       type: String || Number,
       default: undefined
       default: undefined

+ 4 - 4
src/views/common/receivingAddress/chooseAddressModal.vue

@@ -46,14 +46,14 @@
               class="button-primary"
               class="button-primary"
               v-if="record.defaultFlag!=1"
               v-if="record.defaultFlag!=1"
               @click="handleDefault(record)"
               @click="handleDefault(record)"
-              id="chooseAddressList-default-btn">设为默认</a-button>
+              :id="'chooseAddressList-default-'+record.id">设为默认</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
               type="link"
               type="link"
               class="button-primary"
               class="button-primary"
               v-if="record.readOnlyFlag!=1"
               v-if="record.readOnlyFlag!=1"
               @click="handleEdit(record)"
               @click="handleEdit(record)"
-              id="chooseAddressList-edit-btn"
+              :id="'chooseAddressList-edit-'+record.id"
             >编辑</a-button>
             >编辑</a-button>
             <a-button
             <a-button
               size="small"
               size="small"
@@ -61,7 +61,7 @@
               class="button-error"
               class="button-error"
               v-if="record.readOnlyFlag!=1"
               v-if="record.readOnlyFlag!=1"
               @click="handleDel(record)"
               @click="handleDel(record)"
-              id="chooseAddressList-del-btn"
+              :id="'chooseAddressList-del-'+record.id"
             >删除</a-button>
             >删除</a-button>
           </div>
           </div>
         </template>
         </template>
@@ -72,7 +72,7 @@
             type="link"
             type="link"
             class="button-primary"
             class="button-primary"
             @click="handleChoose(record)"
             @click="handleChoose(record)"
-            id="chooseAddressList-choose-btn">选择</a-button>
+            :id="'chooseAddressList-sel-'+record.id">选择</a-button>
         </template>
         </template>
       </s-table>
       </s-table>
     </a-spin>
     </a-spin>

+ 9 - 11
src/views/common/receivingAddress/editAddressModal.vue

@@ -39,21 +39,21 @@
             <a-col span="8">
             <a-col span="8">
               <a-form-model-item prop="provinceSn">
               <a-form-model-item prop="provinceSn">
                 <a-select id="editAddress-provinceSn" allowClear @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
                 <a-select id="editAddress-provinceSn" allowClear @change="getCityList" v-model="form.provinceSn" placeholder="请选择省">
-                  <a-select-option v-for="item in addrProvinceList" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in addrProvinceList" :id="item.areaSn" :value="item.areaSn" :key="item.areaSn + 'a'">{{ item.name }}</a-select-option>
                 </a-select>
                 </a-select>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col span="8">
             <a-col span="8">
               <a-form-model-item prop="citySn">
               <a-form-model-item prop="citySn">
                 <a-select id="editAddress-citySn" allowClear @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
                 <a-select id="editAddress-citySn" allowClear @change="getAreaList" v-model="form.citySn" placeholder="请选择市">
-                  <a-select-option v-for="item in addrCityList" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in addrCityList" :id="item.areaSn" :value="item.areaSn" :key="item.areaSn + 'b'">{{ item.name }}</a-select-option>
                 </a-select>
                 </a-select>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
             <a-col span="8">
             <a-col span="8">
               <a-form-model-item prop="countySn">
               <a-form-model-item prop="countySn">
                 <a-select id="editAddress-countySn" allowClear @change="areaCharged" v-model="form.countySn" placeholder="请选择区/县">
                 <a-select id="editAddress-countySn" allowClear @change="areaCharged" v-model="form.countySn" placeholder="请选择区/县">
-                  <a-select-option v-for="item in addrDistrictList" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in addrDistrictList" :id="item.areaSn" :value="item.areaSn" :key="item.areaSn + 'c'">{{ item.name }}</a-select-option>
                 </a-select>
                 </a-select>
               </a-form-model-item>
               </a-form-model-item>
             </a-col>
             </a-col>
@@ -99,15 +99,15 @@ export default {
         wrapperCol: { span: 18 }
         wrapperCol: { span: 18 }
       },
       },
       form: {
       form: {
-        consigneeName: '',
-        consigneeTel: '',
-        provinceSn: undefined,
+        consigneeName: '', // 收货人
+        consigneeTel: '', // 联系电话
+        provinceSn: undefined, // 省
         provinceName: '',
         provinceName: '',
-        citySn: undefined,
+        citySn: undefined, // 市
         cityName: '',
         cityName: '',
-        countySn: undefined,
+        countySn: undefined, // 区
         countyName: '',
         countyName: '',
-        addr: ''
+        addr: ''// 详细地址
       },
       },
       rules: {
       rules: {
         consigneeName: [
         consigneeName: [
@@ -151,7 +151,6 @@ export default {
             }
             }
           })
           })
         } else {
         } else {
-          console.log('error submit!!')
           return false
           return false
         }
         }
       })
       })
@@ -220,7 +219,6 @@ export default {
     setData (data) {
     setData (data) {
       this.isEdit = true
       this.isEdit = true
       Promise.all([getArea({ type: '2' }), getArea({ parentId: data.provinceSn, type: '3' }), getArea({ parentId: data.citySn, type: '4' })]).then(res => {
       Promise.all([getArea({ type: '2' }), getArea({ parentId: data.provinceSn, type: '3' }), getArea({ parentId: data.citySn, type: '4' })]).then(res => {
-        console.log(res)
         this.addrProvinceList = res[0].data
         this.addrProvinceList = res[0].data
         const provinceName = this.addrProvinceList.find(item => item.id == data.provinceSn)
         const provinceName = this.addrProvinceList.find(item => item.id == data.provinceSn)
         if (provinceName && provinceName.name) {
         if (provinceName && provinceName.name) {