浏览代码

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

chenrui 2 年之前
父节点
当前提交
f4f05ea699

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/bulkManagement/bulkReturnGoods/chooseImportModal.vue

@@ -107,7 +107,7 @@ export default {
         { title: '仓库', dataIndex: 'warehouseName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
-        { title: '退货单价', dataIndex: 'returnPrice', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货单价', dataIndex: 'returnPrice', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? Number(text).toFixed(2) : '--') } },
         { title: '退货数量', dataIndex: 'returnQtyStr', width: '14%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],

+ 2 - 1
src/views/chainReportData/chainSalesDetailsCountReport/list.vue

@@ -59,7 +59,8 @@
         class="sTable"
         ref="table"
         size="small"
-        :rowKey="(record) => record.id"
+        :rowKey="(record) => record.targetSn"
+        rowKeyName="targetSn"
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"

+ 1 - 1
src/views/numsGoodsShelves/shelfSet/set.vue

@@ -99,7 +99,7 @@
               size="small"
               type="link"
               :class="record.enableFlag==1?'button-error':'button-primary'"
-              v-if="record.shelfProductApiEntity&&!(record.shelfProductApiEntity.qty)&&record.shelfProductApiEntity.productSn"
+              v-if="record.shelfProductApiEntity&&(!record.shelfProductApiEntity.qty||(record.enableFlag==0&&record.shelfProductApiEntity.qty))&&record.shelfProductApiEntity.productSn"
               @click="handleEnable(record)"
             >{{record.enableFlag==1?'禁用':'启用'}}</a-button>
             <a-button

+ 2 - 2
vue.config.js

@@ -211,8 +211,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111:8503/qpls-md',
-        target: 'http://p.iscm.360arrow.com/qpls-md',
+        target: 'http://192.168.2.111/qpls-md',
+        // target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,