chenrui 4 years ago
parent
commit
d0bcf8e333

+ 1 - 1
.env

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=https://it.zyucgj.com/zyit/
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#fa541c
+VUE_APP_THEME_COLOR=#ff0000
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
.env.development

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=/api
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统-dev
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#fa541c
+VUE_APP_THEME_COLOR=#ff0000
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
.env.preview

@@ -4,6 +4,6 @@ VUE_APP_API_BASE_URL=http://it.test.zyucgj.com/zyit
 VUE_APP_VERSION=V1.0.1
 VUE_APP_PRO_NAME=箭冠汽配连锁系统-pre
 VUE_APP_LOGO=@/assets/logo.png
-VUE_APP_THEME_COLOR=#1890FF
+VUE_APP_THEME_COLOR=#ff0000
 VUE_APP_COM_NAME=广州市箭冠网络科技有限公司
 VUE_APP_ICP=粤ICP备10216726号

+ 1 - 1
src/config/defaultSettings.js

@@ -14,7 +14,7 @@
  */
 
 export default {
-  primaryColor: '#fa541c', // primary color of ant design
+  primaryColor: '#ff0000', // primary color of ant design
   navTheme: 'dark', // theme for nav menu
   layout: 'sidemenu', // nav menu position: sidemenu or topmenu
   contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu

+ 5 - 7
src/views/basicData/supplierManagement/list.vue

@@ -54,8 +54,6 @@ export default {
   components: { STable, VSelect },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
       queryParam: { //  查询条件
         bundleName: '', //  供应商名称
         state: undefined,  //  状态
@@ -63,11 +61,11 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '供应商名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '地址', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true },
-        { title: '联系人', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '联系电话', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '主营内容', dataIndex: 'inventoryNum', width: 180, align: 'center', ellipsis: true },
+        { title: '供应商名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '地址', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '主营内容', dataIndex: 'inventoryNum', width: 180, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }

+ 7 - 7
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -47,13 +47,13 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 170, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 170, align: 'center' },
-        { title: '入库时间', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '仓库', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '仓位', dataIndex: 'productTypes', width: 200, align: 'center' },
-        { title: '入库类型', dataIndex: 'productTypess', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productNum', width: 170, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 170, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'productType', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'productTypes', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '入库类型', dataIndex: 'productTypess', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '库存数量', dataIndex: 'inventoryNum', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本单价', dataIndex: 'inventoryMoney', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
       ],

+ 5 - 5
src/views/inventoryManagement/inventoryQuery/list.vue

@@ -100,11 +100,11 @@ export default {
       typeData: [],  //  产品类别下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
-        { title: '产品品牌', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '现有库存数量(个)', dataIndex: 'inventoryNum', width: 180, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '现有库存成本(¥)', dataIndex: 'inventoryMoney', width: 180, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }

+ 9 - 9
src/views/inventoryManagement/inventoryQuery/warehouseDetail.vue

@@ -98,15 +98,15 @@ export default {
       dateFormat: 'YYYY-MM-DD',
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
-        { title: '入库批次时间', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '单据类型', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '单据审核时间', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '单位名称', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '仓库', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '仓位', dataIndex: 'productBrand', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '入库批次时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据类型', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单据审核时间', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓库', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '仓位', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'inventoryNum', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总成本', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'inventoryMoneys', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 27 - 20
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -88,7 +88,7 @@
         <div class="editable-row-operations">
           <span v-if="record.editable">
             <a @click="() => save(record.key)">保存</a>
-            <a-popconfirm title="Sure to cancel?" @confirm="() => cancel(record.key)">
+            <a-popconfirm title="确定要取消吗" @confirm="() => cancel(record.key)">
               <a>取消</a>
             </a-popconfirm>
           </span>
@@ -126,19 +126,19 @@ export default {
       typeData: [],  //  产品类别下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center' },
-        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '级别', dataIndex: 'productNasme', width: 100, align: 'center' },
-        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
-        { title: '产品品牌', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center' },
+        { title: '产品编码', dataIndex: 'productNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '级别', dataIndex: 'productNasme', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品分类', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '实时库存数(个)', dataIndex: 'inventoryNumy', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '在途数(个)', scopedSlots: { customRender: 'onWayNum' }, width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总库存数(个)', dataIndex: 'inventoryNumw', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库存数(个)', scopedSlots: { customRender: 'maxInventory' }, width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最小库存数(个)', scopedSlots: { customRender: 'minInventory' }, width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '差异数量', dataIndex: 'inventoryNumh', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '预警提示', dataIndex: 'inventoryNum', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '预警提示', dataIndex: 'inventoryNum', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -159,7 +159,7 @@ export default {
             pageNo: 1,
             pageSize: 10,
             list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+              { key: '1', id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
             ]
           }
           const no = (data.pageNo - 1) * data.pageSize
@@ -208,43 +208,49 @@ export default {
       })
     },
     handleChange(value, key, column) {
-      const newData = [...this.data];
+      const newData = [...this.loadData];
       const target = newData.filter(item => key === item.key)[0];
       if (target) {
         target[column] = value;
-        this.data = newData;
+        this.loadData = newData;
       }
     },
+    //  编辑
     edit(key) {
-      const newData = [...this.data];
-      const target = newData.filter(item => key === item.key)[0];
-      this.editingKey = key;
+      console.log(111,this.loadData)
+      const newData = [...this.loadData]
+      console.log(333)
+      const target = newData.filter(item => key === item.key)[0]
+      this.editingKey = key
       if (target) {
-        target.editable = true;
-        this.data = newData;
+        target.editable = true
+        this.loadData = newData
       }
+      console.log(222)
     },
+    //  保存
     save(key) {
-      const newData = [...this.data];
+      const newData = [...this.loadData];
       const newCacheData = [...this.cacheData];
       const target = newData.filter(item => key === item.key)[0];
       const targetCache = newCacheData.filter(item => key === item.key)[0];
       if (target && targetCache) {
         delete target.editable;
-        this.data = newData;
+        this.loadData = newData;
         Object.assign(targetCache, target);
         this.cacheData = newCacheData;
       }
       this.editingKey = '';
     },
+    //  取消
     cancel(key) {
-      const newData = [...this.data];
+      const newData = [...this.loadData];
       const target = newData.filter(item => key === item.key)[0];
       this.editingKey = '';
       if (target) {
         Object.assign(target, this.cacheData.filter(item => key === item.key)[0]);
         delete target.editable;
-        this.data = newData;
+        this.loadData = newData;
       }
     },
     //  导出
@@ -256,6 +262,7 @@ export default {
         this.download(res)
       })
     },
+    //  下载
     download (data) {
       if (!data) { return }
       const url = window.URL.createObjectURL(new Blob([data]))

+ 2 - 2
src/views/inventoryManagement/satelliteWarehouseInventory/addModal.vue

@@ -107,10 +107,10 @@ export default {
     },
     //  补货数量  减
     handleNumSubtract(row){
-      this.val > 1 ? this.val-- : this.delPjInfo(row)
+      this.val > 1 ? this.val-- : this.handleRemove(row)
     },
     //  删除配件信息
-    delPjInfo(row){
+    handleRemove(row){
       console.log('删除')
     },
     //  补货数量  change

+ 28 - 26
src/views/inventoryManagement/satelliteWarehouseInventory/list.vue

@@ -45,13 +45,19 @@
 			</a-form-model>
 		</div>
 		<!-- 操作按钮 -->
-		<div class="table-operator"><a-button id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">补货清单</a-button></div>
+		<div class="table-operator">
+      <a-button id="satelliteWarehouseInventoryList-replenishment" type="primary" @click="handleReplenishment">
+        补货清单
+        <span v-if="checkedList.length>0">({{checkedList.length}})</span>
+      </a-button>
+    </div>
 		<!-- 列表 -->
 		<s-table class="sTable" ref="table" size="default" :rowKey="record => record.id" :columns="columns" :data="loadData" bordered>
 			<!-- 操作 -->
 			<template slot="action" slot-scope="text, record">
-				<a-button type="primary" @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
-			</template>
+        <a-button type="danger" v-if="checkedList.indexOf(record.id) != -1" @click="handleRemove(record)" id="satelliteWarehouseInventoryList-remove-btn">移出补货清单</a-button>
+				<a-button type="primary" v-else @click="handleAdd(record)" id="satelliteWarehouseInventoryList-add-btn">加入补货单</a-button>
+      </template>
 		</s-table>
 		<!-- 客户详情 -->
 		<satellite-warehouse-inventory-add-modal :openModal="openModal" @close="closeModal" />
@@ -79,19 +85,15 @@ export default {
 			rules: {
 				customer: [{ required: true, message: '请输入客户名称', trigger: 'blur' }]
 			},
-			exportLoading: false, // 导出loading
 			disabled: false, //  查询、重置按钮是否可操作
 			brandData: [], //  产品品牌下拉数据
-			typeData: [], //  产品类别下拉数据
-			dateFormat: 'YYYY-MM-DD',
-			creatTime: [], //  创建时间
 			columns: [
 				{ title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-				{ title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-				{ title: '配件名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true },
-				{ title: '产品编码', dataIndex: 'productOldNum', width: 160, align: 'center' },
-				{ title: '原厂编码', dataIndex: 'productType', width: 200, align: 'center' },
-				{ title: '当前库存', dataIndex: 'inventoryNumss', width: 180, align: 'center' },
+				{ title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+				{ title: '配件名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+				{ title: '产品编码', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '原厂编码', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+				{ title: '当前库存', dataIndex: 'inventoryNumss', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
 				{ title: '操作', scopedSlots: { customRender: 'action' }, width: 150, align: 'center' }
 			],
 			// 加载数据方法 必须为 Promise 对象
@@ -112,16 +114,9 @@ export default {
 						pageNo: 1,
 						pageSize: 10,
 						list: [
-							{
-								id: '1',
-								productNum: 'jgqp11111111111',
-								productName: '产品1',
-								productOldNum: 'jgqp111123545',
-								productBrand: '箭冠品牌',
-								productType: '产品分类1',
-								inventoryNum: '5',
-								inventoryMoney: '122'
-							}
+							{ id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
+							{ id: '2', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
+							{ id: '3', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', inventoryNumss: '0' },
 						]
 					};
 					const no = (data.pageNo - 1) * data.pageSize;
@@ -130,9 +125,10 @@ export default {
 					}
 					_this.disabled = false;
 					resolve(data);
-				});
+				})
 			},
-			openModal: false //  查看客户详情  弹框
+			openModal: false, //  查看客户详情  弹框
+      checkedList: []  //  加入补货单数据
 		};
 	},
 	methods: {
@@ -165,8 +161,14 @@ export default {
 		handleReplenishment() {
 			this.openModal = true
 		},
-		//  加入货补单
-		handleAdd(row) {},
+		//  加入补货单
+		handleAdd(row) {
+      this.checkedList.indexOf(row.id) == -1 ? this.checkedList.push(row.id) : null
+    },
+    //  移出补货单
+    handleRemove(row){
+      this.checkedList.splice(this.checkedList.indexOf(row.id), 1)
+    },
 		//  关闭弹框
 		closeModal() {
 			this.openModal = false

+ 3 - 5
src/views/inventoryManagement/warehouse/list.vue

@@ -34,7 +34,7 @@
       :columns="columns"
       :data="loadData"
       bordered>
-      <!-- 状态 -->
+      <!-- 仓位 -->
       <template slot="storingLocation" slot-scope="text, record">
         <a-button type="link" @click="goStoringLocation(record)" id="warehouseList-storingLocation-btn">仓位</a-button>
       </template>
@@ -58,8 +58,6 @@ export default {
   components: { STable, VSelect, warehouseEditModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
       queryParam: { //  查询条件
         bundleName: '', //  品牌名称
         state: undefined,  //  状态
@@ -67,8 +65,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '仓库名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '排序', dataIndex: 'productOldNum', width: 160, align: 'center' },
+        { title: '仓库名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '排序', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '仓位', scopedSlots: { customRender: 'storingLocation' }, width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],

+ 2 - 4
src/views/inventoryManagement/warehouse/storingLocation/list.vue

@@ -55,8 +55,6 @@ export default {
   components: { STable, VSelect, storingLocationEditModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
       queryParam: { //  查询条件
         bundleName: '', //  仓位名称
         state: undefined,  //  状态
@@ -64,8 +62,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '仓位名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '排序', dataIndex: 'productOldNum', width: 160, align: 'center' },
+        { title: '仓位名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '排序', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 2 - 4
src/views/productManagement/productBrand/list.vue

@@ -58,8 +58,6 @@ export default {
   components: { STable, VSelect, productBrandEditModal },
   data () {
     return {
-      labelCol: { span: 10 },
-      wrapperCol: { span: 14 },
       queryParam: { //  查询条件
         bundleName: '', //  品牌名称
         state: undefined,  //  状态
@@ -67,8 +65,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品品牌名称', dataIndex: 'productName', align: 'center', ellipsis: true },
-        { title: '首字母', dataIndex: 'productOldNum', width: 160, align: 'center' },
+        { title: '产品品牌名称', dataIndex: 'productName', align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '首字母', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }

+ 5 - 4
src/views/productManagement/productInfo/edit.vue

@@ -20,6 +20,7 @@
         <a-input
           id="productInfoEdit-contactName"
           :maxLength="30"
+          :disabled="isEdit"
           v-model="form.contactName"
           placeholder="请输入产品编码(最多30个字符)"
           allowClear />
@@ -49,7 +50,7 @@
           allowClear />
       </a-form-model-item>
       <a-form-model-item label="产品品牌" prop="contactPhone">
-        <a-select placeholder="请选择" allowClear v-model="form.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
+        <a-select placeholder="请选择" :disabled="isEdit" allowClear v-model="form.dataSourceNo" :showSearch="true" option-filter-prop="children" :filter-option="filterOption">
         	<a-select-option v-for="item in brandData" :key="item.salesChannelNo" :value="item.salesChannelNo">{{ item.salesChannelName }}</a-select-option>
         </a-select>
       </a-form-model-item>
@@ -58,21 +59,21 @@
           <!-- 产品类别 -->
           <a-col span="8">
             <a-form-model-item prop="provinceCode">
-              <a-select id="productInfoEdit-provinceCode" @change="getCityList" v-model="form.provinceCode" placeholder="一级分类">
+              <a-select id="productInfoEdit-provinceCode" :disabled="isEdit" @change="getCityList" v-model="form.provinceCode" placeholder="一级分类">
                 <a-select-option v-for="item in addrProvinceList" :value="item.id" :key="item.id + 'a'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="cityCode">
-              <a-select id="productInfoEdit-cityCode" @change="getAreaList" v-model="form.cityCode" placeholder="二级分类">
+              <a-select id="productInfoEdit-cityCode" :disabled="isEdit" @change="getAreaList" v-model="form.cityCode" placeholder="二级分类">
                 <a-select-option v-for="item in addrCityList" :value="item.id" :key="item.id + 'b'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>
           </a-col>
           <a-col span="8">
             <a-form-model-item prop="districtCode">
-              <a-select id="productInfoEdit-districtCode" @change="areaCharged" v-model="form.districtCode" placeholder="三级分类">
+              <a-select id="productInfoEdit-districtCode" :disabled="isEdit" @change="areaCharged" v-model="form.districtCode" placeholder="三级分类">
                 <a-select-option v-for="item in addrDistrictList" :value="item.id" :key="item.id + 'c'">{{ item.name }}</a-select-option>
               </a-select>
             </a-form-model-item>

+ 29 - 7
src/views/productManagement/productInfo/list.vue

@@ -82,6 +82,28 @@
       :columns="columns"
       :data="loadData"
       bordered>
+      <!-- 产品编码 -->
+      <template slot="productCode" slot-scope="text, record">
+        <a-badge count="箭是冠" :offset="[28,-10]" :number-style="{ backgroundColor: '#fff', color: '#ff0000', boxShadow: '0 0 0 1px #d9d9d9 inset', }" > {{record.productCode}} </a-badge>
+      </template>
+      <!-- 产品类别 -->
+      <!-- 自定义表头 -->
+      <template slot="productTypeCustomTitle">
+        <a-tooltip placement="top">
+          <template slot="title">
+            <span>列表中只显示第三级分类的名称,鼠标移动至文字上,查看上级分类</span>
+          </template>
+          产品类别<a-icon type="question-circle" :style="{ color: '#ff0000', marginLeft: '10px' }" />
+        </a-tooltip>
+      </template>
+      <template slot="productType" slot-scope="text, record">
+        <a-tooltip placement="top">
+          <template slot="title">
+            <span>{{record.productType}}</span>
+          </template>
+          {{record.productType}}
+        </a-tooltip>
+      </template>
       <!-- 状态 -->
       <template slot="state" slot-scope="text, record">
         <span>{{record.state == 1 ? '已启用' : '已禁用'}}</span>
@@ -119,12 +141,12 @@ export default {
       creatTime: [],  //  创建时间
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '产品编码', dataIndex: 'productName', width: 200, align: 'center' },
-        { title: '产品名称', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true },
-        { title: '原厂编码', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '产品品牌', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '产品类别', dataIndex: 'inventoryNum', width: 180, align: 'center' },
-        { title: '终端价(售价)', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
+        { title: '产品编码', scopedSlots: { customRender: 'productCode' }, width: 200, align: 'center' },
+        { title: '产品名称', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '原厂编码', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品品牌', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { slots: { title: 'productTypeCustomTitle' }, scopedSlots: { customRender: 'productType' }, width: 180, align: 'center' },
+        { title: '终端价(售价)', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'createTime', width: 180, align: 'center' },
         { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
@@ -147,7 +169,7 @@ export default {
             pageNo: 1,
             pageSize: 10,
             list: [
-              { id: '1', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
+              { id: '1', productCode: '产品编码12', productNum: 'jgqp11111111111', productName: '产品1', productOldNum: 'jgqp111123545', productBrand: '箭冠品牌', productType: '产品分类1', inventoryNum: '5', inventoryMoney: '122' }
             ]
           }
           const no = (data.pageNo - 1) * data.pageSize

+ 6 - 6
src/views/salesManagement/customerManagement/list.vue

@@ -141,12 +141,12 @@ export default {
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
         { title: '创建时间', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
-        { title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '联系人', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '联系手机', dataIndex: 'productOldNum', width: 160, align: 'center' },
-        { title: '联系电话', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '最后销售时间', dataIndex: 'inventoryNumss', width: 180, align: 'center' },
-        { title: '是否卫星仓', dataIndex: 'inventoryNum', width: 120, align: 'center' },
+        { title: '客户名称', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '联系人', dataIndex: 'productBrand', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系手机', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '联系电话', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '最后销售时间', dataIndex: 'inventoryNumss', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '是否卫星仓', dataIndex: 'inventoryNum', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 270, align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 6 - 6
src/views/salesManagement/urgentItemsOffset/list.vue

@@ -86,13 +86,13 @@ export default {
       brandData: [],  //  客户 下拉数据
       columns: [
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
-        { title: '急件单号', dataIndex: 'productName', width: 200, align: 'center', ellipsis: true },
-        { title: '销售单号', dataIndex: 'productOldNum', width: 160, align: 'center', ellipsis: true },
-        { title: '客户名称', dataIndex: 'productBrand', width: 200, align: 'center' },
-        { title: '总款数', dataIndex: 'productType', width: 200, align: 'center' },
-        { title: '总数量', dataIndex: 'inventoryNum', width: 180, align: 'center', ellipsis: true },
+        { title: '急件单号', dataIndex: 'productName', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', dataIndex: 'productOldNum', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'productBrand', width: 200, align: 'center', ellipsis: true, customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'productType', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'inventoryNum', width: 180, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '创建时间', dataIndex: 'inventoryMoneys', width: 180, align: 'center' },
-        { title: '冲减时间', dataIndex: 'inventoryMoney', width: 180, align: 'center' },
+        { title: '冲减时间', dataIndex: 'inventoryMoney', width: 180, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '状态', scopedSlots: { customRender: 'state' }, width: 180, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 240, align: 'center' }
       ],