Sfoglia il codice sorgente

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

chenrui 2 anni fa
parent
commit
c8f7b835f9

+ 1 - 1
public/version.json

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

+ 2 - 2
src/views/common/shopingCatModal.vue

@@ -48,7 +48,7 @@ export default {
       if (newValue) {
          setTimeout(()=>{
            this.$refs.shopingCat.pageInit(this.paramsData)
-         },200)
+         },500)
       }
     },
   },
@@ -75,7 +75,7 @@ export default {
     padding: 13px 20px;
   }
   .ant-drawer-body {
-    padding: 10px;
+    padding: 0 5px;
     height: calc(100% - 50px);
     display: flex;
     flex-direction: column;

+ 2 - 2
src/views/purchasingManagement/purchaseOrder/chooseImportModal.vue

@@ -98,14 +98,14 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '27%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '28%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       nowUnColumns: [ //  促销品
         { title: '序号', dataIndex: 'no', width: '13%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '26%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '26%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'errorDesc', width: '30%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],

+ 2 - 2
src/views/purchasingManagement/purchaseOrderNew/chooseImportModal.vue

@@ -98,14 +98,14 @@ export default {
         { title: '产品编码', dataIndex: 'productCode', width: '27%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '28%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       nowUnColumns: [ //  促销品
         { title: '序号', dataIndex: 'no', width: '13%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '26%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '26%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: '15%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productUnit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'errorDesc', width: '30%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],

+ 8 - 8
src/views/purchasingManagement/purchaseOrderNew/chooseProductModal.vue

@@ -13,7 +13,7 @@
       <div class="chooseProduct-drawer-box">
         <!-- 搜索条件 -->
         <div ref="searchBox" class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+          <a-form layout="inline" @keyup.enter.native="searchForm">
             <a-row type="flex" :gutter="12" justify="start">
               <a-col flex="auto">
                 <a-form-model-item label="产品编码">
@@ -41,22 +41,21 @@
                 </a-form-item>
               </a-col>
               <a-col flex="auto">
-                <a-button type="primary" @click="searchForm" :disabled="disabled" id="purchaseOrderEdit-refresh">查询</a-button>
-                <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="purchaseOrderEdit-reset">重置</a-button>
+                <a-button type="primary" @click="searchForm" id="purchaseOrderEdit-refresh">查询</a-button>
+                <a-button style="margin-left: 5px" @click="resetSearchForm" id="purchaseOrderEdit-reset">重置</a-button>
               </a-col>
             </a-row>
           </a-form>
         </div>
         <!-- 列表 -->
         <s-table
-          v-if="hasVaild"
+          v-if="hasVaild&&showTable"
           class="sTable"
           ref="table"
           size="small"
           :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
-          :defaultLoadData="false"
           :scroll="{ x: tableWidth , y:tableHeight }"
           @dblclick="handleAdd"
           :pageSize="30"
@@ -192,6 +191,7 @@ export default {
       },
       advanced: false, //  高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
+      showTable: false,
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
@@ -201,6 +201,7 @@ export default {
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
             data.list[i].qty = 1
+            data.list[i].qtyBackups = data.list[i].qty
           }
           this.disabled = false
           return data
@@ -262,6 +263,7 @@ export default {
     // 查询
     searchForm () {
       if (this.hasVaild) {
+        this.showTable = true
         this.$refs.table.refresh(true)
       } else {
         this.$message.info('请输入查询条件')
@@ -279,9 +281,7 @@ export default {
         productTypeSn3: '' //  产品三级分类
       }
       this.productType = []
-      if (this.hasVaild) {
-        this.$refs.table.refresh(true)
-      }
+      this.showTable = false
     },
     onClose () {
       this.$emit('close')

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

@@ -359,6 +359,9 @@ export default {
         if (res.status == 200) {
           this.getOrderDetail(false, true, true)
           this.$message.success(res.message)
+          if(type == 0){
+            row.qtyBackups = row.qty
+          }
         } else {
           row.qty = row.qtyBackups
         }

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

@@ -61,7 +61,7 @@
     <s-table
       class="sTable"
       ref="table"
-      :style="{ height: tableHeight+84.5+'px' }"
+      :style="modes=='pages'?{ height: tableHeight+84.5+'px' }:{}"
       size="small"
       :row-selection="modes=='pages'?{ columnWidth: 40 }:{ columnWidth: 40, getCheckboxProps: record => ({ props: { disabled: !record.productEntity.purchasePrice || !(record.productEntity.onlineFalg == 1&& record.dealerScopeFlag == 1) } }) }"
       @rowSelection="rowSelectionFun"
@@ -69,8 +69,9 @@
       :rowKey="(record) => record.productSn"
       :columns="columns"
       :data="loadData"
-      :scroll="modes=='modals'?{ y: tableHeight }:{ x:tableWidth, y: tableHeight }"
+      :scroll="modes=='pages'?{ y: tableHeight }:{ x:tableWidth, y: tableHeight }"
       :defaultLoadData="false"
+      :pageSize="30"
       bordered>
       <!-- 采购数量 -->
       <template slot="purchaseQty" slot-scope="text, record">
@@ -126,7 +127,7 @@ export default {
     return {
       loading: false,
       tableHeight: 0,
-      tableWidth: 950,
+      tableWidth: 960,
       productType: [],
       queryParam: { //  查询条件
         code: '', //  产品编码
@@ -348,7 +349,7 @@ export default {
     setTableH () {
       this.$nextTick(() => { // 页面渲染完成后的回调
         const tableSearchH = this.$refs.tableSearch.offsetHeight
-        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 200 : 320)
+        this.tableHeight = window.innerHeight - tableSearchH - (this.modes == 'pages' ? 200 : 290)
       })
     }
   },