Forráskód Böngészése

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

chenrui 2 éve
szülő
commit
0c98b95430

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/allocationManagement/chainTransferIn/list.vue

@@ -272,7 +272,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 197
+      this.tableHeight = window.innerHeight - tableSearchH - 232
     }
   },
   watch: {

+ 1 - 1
src/views/allocationManagement/chainTransferOut/list.vue

@@ -408,7 +408,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 273
     }
   },
   watch: {

+ 1 - 1
src/views/allocationManagement/storeTransferOut/list.vue

@@ -418,7 +418,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 273
     }
   },
   watch: {

+ 1 - 1
src/views/allocationManagement/warehouseAllocation/list.vue

@@ -336,7 +336,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 235
+      this.tableHeight = window.innerHeight - tableSearchH - 273
     }
   },
   watch: {

+ 7 - 6
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -91,7 +91,7 @@
                 铺货数量合计:<strong>{{ statisticsObj.totalShelfMaxQty }}</strong>;
                 铺货金额合计:<strong>{{ statisticsObj&&(statisticsObj.totalShelfMaxCost||statisticsObj.totalShelfMaxCost==0)?toThousands(statisticsObj.totalShelfMaxCost,2):'--' }}</strong>;
                 货架取货数量合计:<strong>{{ statisticsObj.totalOrderQty }}</strong>;
-                货架取货金额合计:<strong>{{ statisticsObj&&(statisticsObj.totalOrderAmount||statisticsObj.totalOrderAmount==0)?toThousands(statisticsObj.totalOrderAmount,2):'--'  }}</strong>;
+                货架取货金额合计:<strong>{{ statisticsObj&&(statisticsObj.totalOrderAmount||statisticsObj.totalOrderAmount==0)?toThousands(statisticsObj.totalOrderAmount,2):'--' }}</strong>;
               </div>
               <div>
                 急送数量合计:<strong>{{ statisticsObj.tempOrderQty }}</strong>;
@@ -107,7 +107,8 @@
           ref="table"
           :style="{ height: tableHeight+84.5+'px', wordBreak: 'break-all' }"
           size="small"
-          rowKey="id"
+          :rowKey="(record)=>record.shelfSn"
+          rowKeyName="shelfSn"
           :columns="columns"
           :data="loadData"
           :scroll="{ y: tableHeight }"
@@ -169,28 +170,28 @@ export default {
           slots: { title: 'customTitle' },
           children: [
             { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-            { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text,2) : '--' } }
+            { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '货架订单',
           children: [
             { title: '取货数量', dataIndex: 'totalOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-            { title: '取货金额', dataIndex: 'totalOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text,2) : '--' } }
+            { title: '取货金额', dataIndex: 'totalOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '急送订单',
           children: [
             { title: '急送数量', dataIndex: 'tempOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-            { title: '急送金额', dataIndex: 'tempOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text,2) : '--' } }
+            { title: '急送金额', dataIndex: 'tempOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '销售单',
           children: [
             { title: '销售数量', dataIndex: 'saleOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-            { title: '销售金额', dataIndex: 'saleOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text,2) : '--' } }
+            { title: '销售金额', dataIndex: 'saleOrderAmount', width: '8%', align: 'right', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         }
       ],

+ 2 - 1
src/views/numsGoodsShelves/vinAnalysis/spList.vue

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

+ 3 - 2
src/views/numsGoodsShelves/vinAnalysis/vinList.vue

@@ -164,12 +164,12 @@ export default {
           this.engineOilFilterFlagData = dataObj.engineOilFilterFlagDesc.toString()
           delete dataObj.engineOilFilterFlagDesc
         }
-        this.disabled = true
+
         const params = Object.assign(dataObj, this.queryParam, { airConditionerFilterFlag: this.airConditionerFilterData,
           airFilterFlag: this.airFilterFlagData,
           engineOilFilterFlag: this.engineOilFilterFlagData })
         this.spinning = true
-
+        this.disabled = true
         return queryPage(params).then(res => {
           let data
           if (res.status == 200) {
@@ -181,6 +181,7 @@ export default {
           }
           this.getQueryCount(params)
           this.spinning = false
+          this.disabled = false
           return data
         })
       },

+ 1 - 1
src/views/power/role/roleList.vue

@@ -229,7 +229,7 @@ export default {
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
-      this.tableHeight = window.innerHeight - tableSearchH - 255
+      this.tableHeight = window.innerHeight - tableSearchH - 235
     }
   },
   watch: {