Browse Source

Merge branch 'develop_yh13' of jianguan-web/qpls-md-html into develop_yh14

李磊 2 years ago
parent
commit
6798310935

+ 2 - 5
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -13,12 +13,9 @@
           </a-button>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
-        <template
-          slot="
-            extra"
-          v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
+        <template slot="extra" v-if="$hasPermissions('B_bulkWarehousingOrder_print')">
           <Print :disabled="chooseLoadDataSource.length==0" :showExport="false" @handlePrint="handlePrint"></Print>
-          </p></template>
+        </template>
       </a-page-header>
       <!-- 基础信息 -->
       <div v-show="isShowBisiceInfo" class="bulkWarehousingOrderEdit-cont">

+ 14 - 24
src/views/productManagement/productInfoJg/list.vue

@@ -110,7 +110,7 @@
       ref="table"
       :style="{ height: tableHeight+84.5+'px' }"
       size="small"
-      :row-selection="$hasPermissions('B_JgProduct_enable')?rowSelection:null"
+      :row-selection="$hasPermissions('B_JgProduct_enable')?{columnWidth: '3%', getCheckboxProps: record => ({props: {disabled: record.enabledFlag == undefined}})}:null"
       @rowSelection="rowSelectionFun"
       rowKeyName="productSn"
       :rowKey="(record) => record.productSn"
@@ -175,7 +175,7 @@ import { STable, VSelect } from '@/components'
 import editPriceModal from './editPriceModal.vue'
 export default {
   name: 'ProductJgList',
-  components: { STable, VSelect, ProductType, ProductBrand,editPriceModal },
+  components: { STable, VSelect, ProductType, ProductBrand, editPriceModal },
   mixins: [commonMixin],
   data () {
     return {
@@ -223,22 +223,13 @@ export default {
       itemId: '', //  当前产品id
       productTypeList: [], //  分类下拉数据
       rowSelectionInfo: null,
-      currentDealerInfo:{}
+      currentDealerInfo: {}
     }
   },
   computed: {
-    rowSelection () {
-      return {
-        getCheckboxProps: record => ({
-          props: {
-            disabled: record.enabledFlag == undefined // Column configuration not to be checked
-          }
-        })
-      }
-    },
-    columns(){
+    columns () {
       const _this = this
-     let arr = [
+      let arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '产品编码', dataIndex: 'code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -254,7 +245,7 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '12%', align: 'center' }
       ]
       if (_this.currentDealerInfo.dealerLevel && _this.currentDealerInfo.dealerLevel == 'PROVINCE') { //  省级
-       arr.push(
+        arr.push(
           { title: '省级价', dataIndex: 'provincePrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
           { title: '市级价', dataIndex: 'cityPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
         )
@@ -314,11 +305,11 @@ export default {
       this.rowSelectionInfo = null
       this.$refs.table.clearSelected()
     },
-    //获取省级经销商、市级经销商和特约经销商信息
-    getCurrentDealerInfo(){
+    // 获取省级经销商、市级经销商和特约经销商信息
+    getCurrentDealerInfo () {
       getCurrentDealer().then(res => {
         if (res.status == 200) {
-         this.currentDealerInfo=res.data
+          this.currentDealerInfo = res.data
         }
       })
     },
@@ -392,7 +383,7 @@ export default {
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-       this.getCurrentDealerInfo()
+      this.getCurrentDealerInfo()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
@@ -400,10 +391,10 @@ export default {
     },
     // 打开自定义报价弹窗
     handleEditPrice (row) {
-      this.itemId = row.productSn;
-      let _this=this
-      this.$nextTick(()=>{
-         _this.openEditPriceModal = true
+      this.itemId = row.productSn
+      const _this = this
+      this.$nextTick(() => {
+        _this.openEditPriceModal = true
       })
     }
   },
@@ -423,7 +414,6 @@ export default {
     if (!this.$store.state.app.isNewTab) { // 页签刷新时调用
       this.pageInit()
       this.resetSearchForm()
-     
     }
   },
   activated () {