lilei 4 роки тому
батько
коміт
7def2a5bbb

+ 6 - 1
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -16,6 +16,11 @@
         :row-selection="{
           selectedRowKeys: selectedRowKeys,
           onChange: onSelectChange,
+          getCheckboxProps: record => ({
+            props: {
+              disabled: record.product.cost == undefined, // Column configuration not to be checked
+            }
+          })
         }"
         :rowKey="(record) => record.id"
         :columns="columns"
@@ -116,7 +121,7 @@ export default {
       const obj = []
       _this.selectedRows.map(item => {
         obj.push({
-          showCost: 10,
+          showCost: item.product.cost,
           price: item.goodsPrice,
           origPrice: item.product.productPrice,
           packQty: item.product.packQty,

+ 1 - 1
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -68,7 +68,7 @@ export default {
         { title: '促销价', dataIndex: 'price', width: 150, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
         { title: '数量', dataIndex: 'qty', scopedSlots: { customRender: 'salesNums' }, width: 150, align: 'center' },
         { title: '单位', dataIndex: 'productEntity.unit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '促销类型', dataIndex: 'totalAmount', width: 100, align: 'center', customRender: function (text) { return '¥' + (text || 0) } },
+        { title: '促销类型', dataIndex: 'promotionRulesName', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 200, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.16.103:8602/ocs-admin',
+        target: 'http://192.168.16.104:8602/ocs-admin',
         // target: 'http://ocs-admin.360arrow.com.cn/ocs-admin',
         ws: false,
         changeOrigin: true,