lilei 11 months ago
parent
commit
0739f71e8b

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/basicData/bulkPartsTypeManagement/list.vue

@@ -26,14 +26,14 @@
             type="link"
             class="button-primary"
             @click="handleEdit(record)"
-            id="bulkPartsTypeList-edit-btn">编辑</a-button>
+            :id="'bulkPartsTypeList-edit-'+record.id">编辑</a-button>
           <a-button
             v-if="$hasPermissions('B_basicData_bulkPartsType_del') && record.sysFlag==0"
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
-            id="bulkPartsTypeList-del-btn"
+            :id="'bulkPartsTypeList-del-'+record.id"
             style="margin: 0 0 0 8px;">删除</a-button>
           <span v-if="!($hasPermissions('B_basicData_bulkPartsType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_bulkPartsType_del') && record.sysFlag==0)">--</span>
         </template>

+ 1 - 0
src/views/basicData/customerTypeManagement/editModal.vue

@@ -85,6 +85,7 @@ export default {
     }
   },
   methods: {
+    // 过滤空格
     filterEmpty () {
       let str = this.form.name
       str = str.replace(/\ +/g, '')

+ 2 - 2
src/views/basicData/customerTypeManagement/list.vue

@@ -42,14 +42,14 @@
             type="link"
             class="button-primary"
             @click="handleEdit(record)"
-            id="customerTypeList-edit-btn">编辑</a-button>
+            :id="'customerTypeList-edit-'+record.id">编辑</a-button>
           <a-button
             size="small"
             v-if="$hasPermissions('B_basicData_customerType_del') && record.sysFlag==0"
             type="link"
             class="button-error"
             @click="handleDel(record)"
-            id="customerTypeList-del-btn">删除</a-button>
+            :id="'customerTypeList-del-'+record.id">删除</a-button>
           <span v-if="!($hasPermissions('B_basicData_customerType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_customerType_del') && record.sysFlag==0)">--</span>
         </template>
       </s-table>

+ 3 - 2
src/views/basicData/expenseType/editModal.vue

@@ -33,8 +33,8 @@
           </a-form-model-item>
         </a-form-model>
         <div class="btn-cont">
-          <a-button type="primary" id="product-category-edit-modal-save" @click="handleSave">保存</a-button>
-          <a-button id="product-category-edit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
+          <a-button type="primary" id="expenseTypeEdit-modal-save" @click="handleSave">保存</a-button>
+          <a-button id="expenseTypeEdit-modal-back" @click="isShow = false" style="margin-left: 15px;">返回列表</a-button>
         </div>
       </div>
     </a-spin>
@@ -88,6 +88,7 @@ export default {
     }
   },
   methods: {
+    // 过滤空格
     filterEmpty () {
       let str = this.form.name
       str = str.replace(/\ +/g, '')

+ 3 - 3
src/views/basicData/expenseType/list.vue

@@ -28,7 +28,7 @@
             class="button-primary"
             size="small"
             icon="plus"
-            id="expenseType-addSubItem"
+            :id="'expenseType-addSubItem-'+record.id"
             @click="handleAdd(record)">新增子级</a-button>
           <a-button
             v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.sysFlag==0"
@@ -36,7 +36,7 @@
             class="button-primary"
             size="small"
             icon="edit"
-            id="expenseType-edit"
+            :id="'expenseType-edit-'+record.id"
             @click="handleEdit(record)">编辑</a-button>
           <a-button
             v-if="record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.sysFlag==0"
@@ -44,7 +44,7 @@
             class="button-error"
             size="small"
             icon="delete"
-            id="expenseType-del"
+            :id="'expenseType-del-'+record.id"
             @click="handleDel(record)">删除</a-button>
           <span v-if="!(record.typeLevel<3 && $hasPermissions('B_basicData_expenseType_add')) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_edit') && record.sysFlag==0) && !(record.pid != 0 && $hasPermissions('B_basicData_expenseType_del') && record.sysFlag==0)">--</span>
         </template>

+ 8 - 7
src/views/basicData/notificationManage/list.vue

@@ -16,19 +16,19 @@
         bordered>
         <!-- 操作 -->
         <template slot="action1" slot-scope="text, record, index">
-          <a-checkbox :checked="text==1" @change="onChange(0,record)"></a-checkbox>
+          <a-checkbox :id="'ac1-'+record.id" :checked="text==1" @change="onChange(0,record)"></a-checkbox>
         </template>
         <template slot="action2" slot-scope="text, record, index">
-          <a-checkbox :checked="text==1" @change="onChange(1,record)"></a-checkbox>
+          <a-checkbox :id="'ac2-'+record.id" :checked="text==1" @change="onChange(1,record)"></a-checkbox>
         </template>
         <template slot="action3" slot-scope="text, record, index">
-          <a-checkbox :checked="text==1" @change="onChange(2,record)"></a-checkbox>
+          <a-checkbox :id="'ac3-'+record.id" :checked="text==1" @change="onChange(2,record)"></a-checkbox>
         </template>
         <template slot="action4" slot-scope="text, record, index">
-          <a-checkbox :checked="text==1" @change="onChange(3,record)"></a-checkbox>
+          <a-checkbox :id="'ac4-'+record.id" :checked="text==1" @change="onChange(3,record)"></a-checkbox>
         </template>
         <template slot="action5" slot-scope="text, record, index">
-          <a-checkbox :checked="text==1" @change="onChange(4,record)"></a-checkbox>
+          <a-checkbox :id="'ac5-'+record.id" :checked="text==1" @change="onChange(4,record)"></a-checkbox>
         </template>
       </a-table>
     </a-spin>
@@ -57,15 +57,15 @@ export default {
         { title: '货架异常提醒', dataIndex: 'shelfWarnFlag', scopedSlots: { customRender: 'action4' }, width: '10%', align: 'center' },
         { title: '全选', dataIndex: 'allFlag', scopedSlots: { customRender: 'action5' }, width: '10%', align: 'center' }
       ],
-      loadData: [],
+      loadData: [], // 列表数据
       openModal: false, //  新增编辑客户类型  弹框
       itemId: '', //  当前id
       nowData: null //  当前记录数据
     }
   },
   methods: {
+    // 选择
     onChange (index, record) {
-      console.log(index, record)
       const key = ['tempOrderFlag', 'shelfReplenishFlag', 'shelfOrderFlag', 'shelfWarnFlag', 'allFlag']
       record[key[index]] = record[key[index]] ? 0 : 1
       // 全选
@@ -103,6 +103,7 @@ export default {
         this.getData()
       })
     },
+    // 获取列表数据
     getData () {
       this.spinning = true
       noticeUserBizQuery().then(res => {

+ 1 - 0
src/views/basicData/storeTransferOutTypeManagement/editModal.vue

@@ -85,6 +85,7 @@ export default {
     }
   },
   methods: {
+    // 过滤空格
     filterEmpty () {
       let str = this.form.name
       str = str.replace(/\ +/g, '')

+ 2 - 2
src/views/basicData/storeTransferOutTypeManagement/list.vue

@@ -31,14 +31,14 @@
             type="link"
             class="button-primary"
             @click="handleEdit(record)"
-            id="storeTransferOutTypeList-edit-btn">编辑</a-button>
+            :id="'storeTransferOutTypeList-edit-'+record.id">编辑</a-button>
           <a-button
             v-if="$hasPermissions('B_basicData_storeTransferOutType_del') && record.sysFlag==0 "
             size="small"
             type="link"
             class="button-error"
             @click="handleDel(record)"
-            id="storeTransferOutTypeList-del-btn">删除</a-button>
+            :id="'storeTransferOutTypeList-del-'+record.id">删除</a-button>
           <span v-if="!($hasPermissions('B_basicData_storeTransferOutType_edit') && record.sysFlag==0) && !($hasPermissions('B_basicData_storeTransferOutType_del') && record.sysFlag==0)">--</span>
         </template>
       </s-table>

+ 12 - 12
src/views/basicData/systemSettings/index.vue

@@ -7,11 +7,11 @@
             产品报价,箭冠产品优先获取自定义车主价和终端价
           </a-col>
           <a-col class="gutter-row" :span="12">
-            <a-radio-group v-model="priceValue" @change="handleQty">
-              <a-radio :value="1">
+            <a-radio-group v-model="priceValue" @change="handleQty" id="productPrice-enable">
+              <a-radio :value="1" id="productPrice-enable1">
                 启用
               </a-radio>
-              <a-radio :value="2">
+              <a-radio :value="2" id="productPrice-enable2">
                 禁用
               </a-radio>
             </a-radio-group>
@@ -25,11 +25,11 @@
             销售下单时,是否显示产品库存为0的产品信息
           </a-col>
           <a-col class="gutter-row" :span="12">
-            <a-radio-group v-model="qtyValue" @change="handleQty">
-              <a-radio :value="1">
+            <a-radio-group v-model="qtyValue" @change="handleQty" id="productPrice-qty-show">
+              <a-radio :value="1" id="productPrice-show-1">
                 显示
               </a-radio>
-              <a-radio :value="2">
+              <a-radio :value="2" id="productPrice-show-2">
                 隐藏
               </a-radio>
             </a-radio-group>
@@ -41,11 +41,11 @@
             销售下单时,是否显示废品仓的产品信息
           </a-col>
           <a-col class="gutter-row" :span="12">
-            <a-radio-group v-model="wasteInfoValue" @change="handleWasteInfo">
-              <a-radio :value="1">
+            <a-radio-group v-model="wasteInfoValue" @change="handleWasteInfo" id="productPrice-show-war">
+              <a-radio :value="1" id="productPrice-show-war1">
                 显示
               </a-radio>
-              <a-radio :value="2">
+              <a-radio :value="2" id="productPrice-show-war2">
                 隐藏
               </a-radio>
             </a-radio-group>
@@ -57,11 +57,11 @@
             库存预警,是否包含废品库数量
           </a-col>
           <a-col class="gutter-row" :span="12">
-            <a-radio-group v-model="wasteNumValue" @change="handleWasteNum">
-              <a-radio :value="1">
+            <a-radio-group v-model="wasteNumValue" @change="handleWasteNum" id="productPrice-show-warqty">
+              <a-radio :value="1" id="productPrice-show-warqty1">
                 包含
               </a-radio>
-              <a-radio :value="2">
+              <a-radio :value="2" id="productPrice-show-warqty2">
                 不包含
               </a-radio>
             </a-radio-group>

+ 4 - 4
src/views/supplierManagement/supplierInfo/editModal.vue

@@ -34,21 +34,21 @@
               <a-col span="8">
                 <a-form-model-item prop="provinceSn">
                   <a-select id="supplierInfoEdit-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-form-model-item>
               </a-col>
               <a-col span="8">
                 <a-form-model-item prop="citySn">
                   <a-select id="supplierInfoEdit-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-form-model-item>
               </a-col>
               <a-col span="8">
                 <a-form-model-item prop="countySn">
                   <a-select id="supplierInfoEdit-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-form-model-item>
               </a-col>
@@ -186,6 +186,7 @@ export default {
     }
   },
   methods: {
+    // 过滤空格
     filterEmpty () {
       let str = this.form.supplierName
       str = str.replace(/\ +/g, '')
@@ -224,7 +225,6 @@ export default {
             }
           })
         } else {
-          console.log('error submit!!')
           return false
         }
       })

+ 3 - 1
src/views/supplierManagement/supplierInfo/list.vue

@@ -50,7 +50,7 @@
           type="link"
           class="button-primary"
           @click="handleEdit(record)"
-          id="supplierInfoList-edit-btn">编辑</a-button>
+          :id="'supplierInfoList-edit-'+record.id">编辑</a-button>
         <span v-else>--</span>
       </template>
     </s-table>
@@ -132,12 +132,14 @@ export default {
       this.openModal = false
       this.$refs.table.refresh(true)
     },
+    // 页面初始化
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
     },
+    // 计算表格高度
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 235