lilei 2 gadi atpakaļ
vecāks
revīzija
6afd1ae499

+ 1 - 1
public/version.json

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

+ 0 - 1
src/components/Table/index.js

@@ -128,7 +128,6 @@ export default {
       showTotal: total => `共 ${total} 条记录`,
       showSizeChanger: this.showSizeChanger
     }) || false
-    // console.log('this.localPagination', this.localPagination)
     this.needTotalList = this.initTotalList(this.columns)
     if (this.defaultLoadData) {
       this.loadData()

+ 1 - 4
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -125,10 +125,7 @@
                 </template>
                 <!-- 包装数 -->
                 <template slot="baozh" slot-scope="text, record">
-                  <span v-if="record.packQty&&record.packQtyUnit">
-                    {{ record.packQty||'--' }}{{ record.unit }}/{{ record.packQtyUnit||'--' }}
-                  </span>
-                  <span v-else>--</span>
+                  {{ record.packQty||'--' }}{{ record.packQty ? record.unit : '' }}/{{ record.packQtyUnit||'--' }}
                 </template>
                 <!-- 产品编码 -->
                 <template slot="code" slot-scope="text, record">

+ 1 - 4
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -72,10 +72,7 @@
           </template>
           <!-- 包装数 -->
           <template slot="baozh" slot-scope="text, record">
-            <span v-if="record.packQty&&record.packQtyUnit">
-              {{ record.packQty||'--' }}{{ record.unit }}/{{ record.packQtyUnit||'--' }}
-            </span>
-            <span v-else>--</span>
+            {{ record.packQty||'--' }}{{ record.packQty ? record.unit : '' }}/{{ record.packQtyUnit||'--' }}
           </template>
           <!-- 产品编码 -->
           <template slot="code" slot-scope="text, record">

+ 1 - 0
src/views/purchasingManagement/purchaseOrderNew/edit.vue

@@ -107,6 +107,7 @@
             :data="chooseLoadData"
             :defaultLoadData="false"
             :showPagination="false"
+            :pageSize="5000"
             bordered>
             <!-- 采购数量 -->
             <template slot="storageQuantity" slot-scope="text, record">

+ 1 - 4
src/views/shoppingCarManagement/shoppingCar/list.vue

@@ -86,10 +86,7 @@
       </template>
       <!-- 包装数 -->
       <template slot="baozh" slot-scope="text, record">
-        <span v-if="record.productEntity.packQty&&record.productEntity.packQtyUnit">
-          {{ record.productEntity.packQty||'--' }}{{ record.productEntity.unit }}/{{ record.productEntity.packQtyUnit||'--' }}
-        </span>
-        <span v-else>--</span>
+        {{ record.productEntity.packQty||'--' }}{{ record.productEntity.packQty ? record.productEntity.unit : '' }}/{{ record.productEntity.packQtyUnit||'--' }}
       </template>
       <!-- 产品编码 -->
       <template slot="productCode" slot-scope="text, record">