lilei 9 meses atrás
pai
commit
df331debeb

+ 1 - 1
public/version.json

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

+ 9 - 7
src/views/salesManagement/salesQuery/list.vue

@@ -88,7 +88,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户关系">
                 <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>
@@ -289,18 +289,19 @@ export default {
         endDate: getDate.getMonthDays(3).endtime,
         endDate: getDate.getMonthDays(3).endtime,
         auditBeginDate: '',
         auditBeginDate: '',
         auditEndDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate: '',
-        outWarehouseEndDate: '',
+        outWarehouseBeginDate: '', // 出库开始时间
+        outWarehouseEndDate: '', // 出库结束时间
         buyerNameCurrent: undefined, //  客户名称
         buyerNameCurrent: undefined, //  客户名称
-        buyerSn: undefined,
+        buyerSn: undefined, // 客户sn
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         purchaseBillNo: '', //  采购单号
         purchaseBillNo: '', //  采购单号
         payType: undefined, //  支付方式
         payType: undefined, //  支付方式
         settleStyleSn: undefined, //  收款方式
         settleStyleSn: undefined, //  收款方式
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
         financialStatus: undefined, //  财务状态
         financialStatus: undefined, //  财务状态
-        sourceType: undefined,
-        distributionFlag: undefined
+        sourceType: undefined, // 单据来源
+        distributionFlag: undefined, // 铺货出库
+        buyerRelationType: undefined// 客户关系
       },
       },
       totalData: {
       totalData: {
         totalAmount: 0,
         totalAmount: 0,
@@ -345,7 +346,7 @@ export default {
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
-        { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -536,6 +537,7 @@ export default {
       this.queryParam.financialStatus = undefined
       this.queryParam.financialStatus = undefined
       this.queryParam.sourceType = undefined
       this.queryParam.sourceType = undefined
       this.queryParam.distributionFlag = undefined
       this.queryParam.distributionFlag = undefined
+      this.queryParam.buyerRelationType = undefined
       this.$refs.custList.resetForm()
       this.$refs.custList.resetForm()
       if (!flag) {
       if (!flag) {
         this.setIsHomeNav(this.$route.name, null)
         this.setIsHomeNav(this.$route.name, null)

+ 10 - 9
src/views/salesManagement/salesQueryNew/list.vue

@@ -87,7 +87,7 @@
               </a-col>
               </a-col>
               <a-col :span="6">
               <a-col :span="6">
                 <a-form-model-item label="客户关系">
                 <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>
@@ -292,18 +292,19 @@ export default {
         endDate: getDate.getMonthDays(3).endtime,
         endDate: getDate.getMonthDays(3).endtime,
         auditBeginDate: '',
         auditBeginDate: '',
         auditEndDate: '',
         auditEndDate: '',
-        outWarehouseBeginDate: '',
-        outWarehouseEndDate: '',
+        outWarehouseBeginDate: '', // 出库开始时间
+        outWarehouseEndDate: '', // 出库结束时间
         buyerNameCurrent: undefined, //  客户名称
         buyerNameCurrent: undefined, //  客户名称
-        buyerSn: undefined,
+        buyerSn: undefined, // 客户sn
         salesBillNo: '', //  销售单号
         salesBillNo: '', //  销售单号
         purchaseBillNo: '', //  采购单号
         purchaseBillNo: '', //  采购单号
         payType: undefined, //  支付方式
         payType: undefined, //  支付方式
         settleStyleSn: undefined, //  收款方式
         settleStyleSn: undefined, //  收款方式
         billStatus: undefined, //  业务状态
         billStatus: undefined, //  业务状态
         financialStatus: undefined, //  财务状态
         financialStatus: undefined, //  财务状态
-        sourceType: undefined,
-        distributionFlag: undefined
+        sourceType: undefined, // 单据来源
+        distributionFlag: undefined, // 铺货出库
+        buyerRelationType: undefined // 客户关系
       },
       },
       totalData: {
       totalData: {
         totalAmount: 0,
         totalAmount: 0,
@@ -348,7 +349,7 @@ export default {
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: this.showDiscount ? '6%' : '9%', align: 'center' },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: this.showDiscount ? '6%' : '9%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: this.showDiscount ? '12%' : '15%', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: this.showDiscount ? '12%' : '15%', customRender: function (text) { return text || '--' } },
-        { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
@@ -517,7 +518,6 @@ export default {
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.$refs.rangeDate.resetDate(flag ? '' : this.time)
       this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(3).starttime
       this.queryParam.beginDate = flag ? '' : getDate.getMonthDays(3).starttime
       this.queryParam.endDate = flag ? '' : getDate.getMonthDays(3).endtime
       this.queryParam.endDate = flag ? '' : getDate.getMonthDays(3).endtime
-
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditBeginDate = ''
       this.queryParam.auditEndDate = ''
       this.queryParam.auditEndDate = ''
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseBeginDate = ''
@@ -528,7 +528,6 @@ export default {
         this.$refs.auditRangeDate.resetDate('')
         this.$refs.auditRangeDate.resetDate('')
         this.$refs.outWareRangeDate.resetDate('')
         this.$refs.outWareRangeDate.resetDate('')
       }
       }
-
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerSn = undefined
       this.queryParam.buyerSn = undefined
       this.queryParam.salesBillNo = ''
       this.queryParam.salesBillNo = ''
@@ -539,6 +538,8 @@ export default {
       this.queryParam.financialStatus = undefined
       this.queryParam.financialStatus = undefined
       this.queryParam.sourceType = undefined
       this.queryParam.sourceType = undefined
       this.queryParam.distributionFlag = undefined
       this.queryParam.distributionFlag = undefined
+      this.queryParam.buyerRelationType = undefined
+
       this.$refs.custList.resetForm()
       this.$refs.custList.resetForm()
       if (!flag) {
       if (!flag) {
         this.setIsHomeNav(this.$route.name, null)
         this.setIsHomeNav(this.$route.name, null)

+ 8 - 6
src/views/salesManagement/salesReturn/list.vue

@@ -39,7 +39,7 @@
               </a-col>
               </a-col>
               <a-col :md="6" :sm="24">
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="客户关系">
                 <a-form-model-item label="客户关系">
-                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-buyerRelationType" v-model="queryParam.buyerRelationType" allowClear placeholder="请选择客户关系"></v-select>
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>
@@ -164,11 +164,12 @@ export default {
       queryParam: {
       queryParam: {
         beginDate: getDate.getCurrMonthDays().starttime,
         beginDate: getDate.getCurrMonthDays().starttime,
         endDate: getDate.getCurrMonthDays().endtime,
         endDate: getDate.getCurrMonthDays().endtime,
-        auditBeginDate: '',
-        auditEndDate: '',
-        buyerNameCurrent: undefined,
+        auditBeginDate: '', // 审核开始时间
+        auditEndDate: '', // 审核结束时间
+        buyerNameCurrent: undefined, // 客户名称
         salesReturnNo: undefined, //  销售退货单号
         salesReturnNo: undefined, //  销售退货单号
-        state: undefined // 业务状态
+        state: undefined, // 业务状态
+        buyerRelationType: undefined // 客户关系
       },
       },
       countData: null, // 统计数据
       countData: null, // 统计数据
       // 表头
       // 表头
@@ -177,7 +178,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '客户名称', dataIndex: 'buyerNameCurrent', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'buyerRelationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '退款总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '退款总金额', dataIndex: 'totalAmount', width: '7%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总款数', dataIndex: 'totalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -299,6 +300,7 @@ export default {
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.buyerNameCurrent = undefined
       this.queryParam.salesReturnNo = ''
       this.queryParam.salesReturnNo = ''
       this.queryParam.state = undefined
       this.queryParam.state = undefined
+      this.queryParam.buyerRelationType = undefined
       this.$refs.custList.resetForm()
       this.$refs.custList.resetForm()
       if (!flag) {
       if (!flag) {
         this.setIsHomeNav(this.$route.name, null)
         this.setIsHomeNav(this.$route.name, null)

+ 1 - 1
vue.config.js

@@ -209,7 +209,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
     proxy: {
       '/api': {
       '/api': {
-        target: 'http://192.168.2.10/qpls-md',
+        target: 'http://192.168.2.113:8550/qpls-md',
         // target: 'https://p.iscm.360arrow.com/qpls-md',
         // target: 'https://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         // ws: false,
         ws: true,
         ws: true,