Selaa lähdekoodia

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

chenrui 10 kuukautta sitten
vanhempi
commit
8340bf44d3

+ 1 - 1
public/version.json

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

+ 3 - 1
src/views/salesManagement/salesQuery/productSalesRecordModal.vue

@@ -80,10 +80,12 @@ export default {
       },
       // 表头
       columns: [
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售时间', dataIndex: 'salesBillEntity.createDate', width: 250, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售价', dataIndex: 'price', width: 150, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '销售数量', dataIndex: 'qty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户名称', dataIndex: 'salesBillEntity.buyerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '客户名称', dataIndex: 'salesBillEntity.buyerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单据来源', dataIndex: 'salesBillEntity.sourceTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       list: [],
       loading: false,

+ 46 - 44
src/views/salesManagement/salesQueryNew/productSalesRecordModal.vue

@@ -1,50 +1,50 @@
 <template>
   <a-drawer
-      placement="right"
-      :title="modalTit"
-      :visible="isShow"
-      :get-container="false"
-      :wrap-style="{ position: 'absolute' }"
-      @close="isShow=false"
-      :z-index="150"
-      wrapClassName="salesRecord-modal jg-drawer-wrap"
-      width="70%">
-      <div v-if="isShow">
-        <div ref="searchBox">
-          <div style="padding: 0 0 10px 0;line-height: 24px;" v-if="baseData">
-            <div style="flex:1">产品编码:{{ baseData.productCode }}</div>
-            <div style="flex:1">产品名称:{{ baseData.productName }}</div>
-          </div>
-          <a-tabs size="small" type="card" v-model="curTab" @change="callback">
-            <a-tab-pane key="1" tab="当前客户">
-            </a-tab-pane>
-            <a-tab-pane key="2" tab="全部客户">
-            </a-tab-pane>
-          </a-tabs>
+    placement="right"
+    :title="modalTit"
+    :visible="isShow"
+    :get-container="false"
+    :wrap-style="{ position: 'absolute' }"
+    @close="isShow=false"
+    :z-index="150"
+    wrapClassName="salesRecord-modal jg-drawer-wrap"
+    width="70%">
+    <div v-if="isShow">
+      <div ref="searchBox">
+        <div style="padding: 0 0 10px 0;line-height: 24px;" v-if="baseData">
+          <div style="flex:1">产品编码:{{ baseData.productCode }}</div>
+          <div style="flex:1">产品名称:{{ baseData.productName }}</div>
         </div>
-        <!-- 表格 -->
-        <a-table
-          class="sTable"
-          ref="table"
-          size="small"
-          :rowKey="(record) => record.id"
-          :scroll="{ y: tableHeight }"
-          :columns="columns"
-          :dataSource="list"
-          :loading="loading"
-          :pagination="false"
-          bordered>
-        </a-table>
-        <!-- 分页 -->
-        <tablePagination
-          ref="tablePagination"
-          :total="paginationProps.total"
-          :current="paginationProps.current"
-          :pageSize="paginationProps.pageSize"
-          @changePageSize="changePageSize"
-          @changePage="changePage" />
+        <a-tabs size="small" type="card" v-model="curTab" @change="callback">
+          <a-tab-pane key="1" tab="当前客户">
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="全部客户">
+          </a-tab-pane>
+        </a-tabs>
       </div>
-    </a-drawer>
+      <!-- 表格 -->
+      <a-table
+        class="sTable"
+        ref="table"
+        size="small"
+        :rowKey="(record) => record.id"
+        :scroll="{ y: tableHeight }"
+        :columns="columns"
+        :dataSource="list"
+        :loading="loading"
+        :pagination="false"
+        bordered>
+      </a-table>
+      <!-- 分页 -->
+      <tablePagination
+        ref="tablePagination"
+        :total="paginationProps.total"
+        :current="paginationProps.current"
+        :pageSize="paginationProps.pageSize"
+        @changePageSize="changePageSize"
+        @changePage="changePage" />
+    </div>
+  </a-drawer>
 </template>
 
 <script>
@@ -82,10 +82,12 @@ export default {
       },
       // 表头
       columns: [
+        { title: '销售单号', dataIndex: 'salesBillNo', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售时间', dataIndex: 'salesBillEntity.createDate', width: 250, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售价', dataIndex: 'price', width: 150, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '销售数量', dataIndex: 'qty', width: 150, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户名称', dataIndex: 'salesBillEntity.buyerName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
+        { title: '客户名称', dataIndex: 'salesBillEntity.buyerNameCurrent', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '单据来源', dataIndex: 'salesBillEntity.sourceTypeDictValue', width: 100, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       list: [],
       loading: false,