Browse Source

Merge branch 'deploy_0804' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into deploy_0804

chenrui 3 năm trước cách đây
mục cha
commit
8be6f07aa7

+ 3 - 2
src/views/productManagement/productInfo/list.vue

@@ -138,6 +138,7 @@ import { dealerProductList, dealerProductUpdate, dealerProductExport } from '@/a
 import { STable, VSelect } from '@/components'
 import productInfoDetailModal from './detailModal.vue'
 export default {
+  name: 'ProductList',
   components: { STable, VSelect, productInfoDetailModal },
   data () {
     return {
@@ -340,9 +341,9 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.getProductBrand()
+      vm.getProductType()
       if (!vm.disabled) {
-        vm.getProductBrand()
-        vm.getProductType()
         vm.$refs.table.refresh()
       }
     })

+ 8 - 5
src/views/productManagement/productInfoJg/list.vue

@@ -81,7 +81,7 @@
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 1350, y: tableHeight }"
+      :scroll="{ x: 1540, y: tableHeight }"
       bordered>
       <!-- 产品图片 -->
       <template slot="imageUrl" slot-scope="text, record">
@@ -114,6 +114,7 @@ import { productTypeQuery } from '@/api/productType'
 import { productList, getCurrentDealer } from '@/api/product'
 import { STable, VSelect } from '@/components'
 export default {
+  name: 'ProductJgList',
   components: { STable, VSelect },
   data () {
     return {
@@ -188,10 +189,10 @@ export default {
     // 设置表头
     getColumns () {
       this.columns = [
-        { title: '序号', dataIndex: 'no', width: 70, align: 'center', fixed: 'left' },
-        { title: '产品编码', dataIndex: 'code', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
+        { title: '产品编码', dataIndex: 'code', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'name', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '原厂编码', dataIndex: 'origCode', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'origCode', align: 'center', width: 120, customRender: function (text) { return text || '--' } },
         { title: '产品图片', scopedSlots: { customRender: 'imageUrl' }, width: 80, align: 'center' },
         { title: '产品品牌', dataIndex: 'productBrandName', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品分类', scopedSlots: { customRender: 'productType' }, width: 120, align: 'center' }
@@ -295,9 +296,11 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      vm.getColumns()
       vm.getProductBrand()
       vm.getProductType()
+      if (!vm.disabled) {
+        vm.getColumns()
+      }
     })
   }
 }

+ 2 - 2
src/views/salesManagement/salesman/editModal.vue

@@ -231,7 +231,7 @@ export default {
     isShow (newValue, oldValue) {
       if (!newValue) {
         this.$emit('close')
-        this.isEdit = true
+        this.isEdit = false
         this.$refs.ruleForm.resetFields()
       }
     },
@@ -241,7 +241,7 @@ export default {
         console.log(this.isShow)
         this.getDetail()
       } else {
-        this.isEdit = true
+        this.isEdit = false
         this.$refs.ruleForm.resetFields()
       }
     },