Bläddra i källkod

添加客户关系

chenrui 9 månader sedan
förälder
incheckning
4d3ad0141f

+ 12 - 6
src/views/allocationManagement/chainTransferOut/list.vue

@@ -20,12 +20,12 @@
                 <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="连锁调出单号">
-                <a-input id="chainTransferOutList-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="连锁调出单号">
+                  <a-input id="chainTransferOutList-allocationLinkageOutNo" v-model.trim="queryParam.allocationLinkageOutNo" allowClear placeholder="请输入连锁调出单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象">
                   <getTenantList id="chainTransferOutList-putTenantSn" type="out" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
@@ -64,8 +64,13 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="chainTransferOutList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="chainTransferOutList-reset">重置</a-button>
               <a-button
@@ -239,6 +244,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '连锁调出单号', scopedSlots: { customRender: 'allocationLinkageOutNo' }, width: '16%', align: 'center' },
         { title: '调往对象', dataIndex: 'putTenantName', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '总成本', dataIndex: 'productTotalCost', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 13 - 7
src/views/allocationManagement/storeTransferOut/list.vue

@@ -20,12 +20,12 @@
                 <rangeDate ref="outWareRangeDate" :value="outWareTime" @change="outWareDateChange" />
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="店内调出单号">
-                <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
-              </a-form-item>
-            </a-col>
             <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="店内调出单号">
+                  <a-input id="storeTransferOutList-storeCallOutNo" v-model.trim="queryParam.storeCallOutNo" allowClear placeholder="请输入店内调出单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象名称">
                   <custList id="storeTransferOutList-putPersonName" ref="custList" @change="custChange"></custList>
@@ -62,8 +62,13 @@
                   ></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="storeTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align: center;">
+            <a-col :md="6" :sm="24">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
               <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
               <a @click="advanced=!advanced" style="margin-left: 8px">
@@ -230,6 +235,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '店内调出单号', scopedSlots: { customRender: 'storeCallOutNo' }, width: '14%', align: 'center' },
         { title: '调往对象名称', width: '16%', align: 'center', customRender: function (text, record) { return (record.putPersonType == 'CUSTOMER' ? record.customerNameCurrent : record.putPersonName) || '--' }, ellipsis: true },
+        { title: '客户关系', dataIndex: 'relationTypeDictValue', align: 'center', width: '9%', customRender: function (text) { return text || '--' } },
         { title: '调拨类型', dataIndex: 'callOutTypeName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总款数', dataIndex: 'productTotalCategory', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总数量', dataIndex: 'productTotalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -298,7 +304,7 @@ export default {
       this.$refs.outWareRangeDate.resetDate('')
       this.queryParam.outWarehouseBeginDate = ''
       this.queryParam.outWarehouseEndDate = ''
-      if(this.advanced){
+      if (this.advanced) {
         this.$refs.custList.resetForm()
       }
       this.queryParam.customerSnCurrent = undefined

+ 14 - 9
src/views/customerManagement/customerInfo/edit.vue

@@ -28,6 +28,17 @@
                   allowClear />
               </a-form-model-item>
             </a-col>
+            <a-col :span="12">
+              <a-form-model-item label="关联经销商" :labelCol="{ span: 6}" :wrapperCol="{ span: 16 }">
+                <a-input
+                  id="customerManagementEdit-customerName"
+                  :maxLength="30"
+                  v-model.trim="form.customerName"
+                  @change="filterEmpty"
+                  placeholder="请输入关联经销商"
+                  allowClear />
+              </a-form-model-item>
+            </a-col>
             <a-col :span="12">
               <a-form-model-item label="联系电话" prop="contactTel" :labelCol="{ span: 6}" :wrapperCol="{ span: 16 }">
                 <a-input id="customerManagementEdit-contactTel" :maxLength="15" v-model.trim="form.contactTel" placeholder="请输入联系电话(最多15个字符)" allowClear />
@@ -74,12 +85,6 @@
               </a-form-model-item>
             </a-col>
             <a-col :span="8" v-if="form.relationTypeDictValue">
-              <!-- <a-form-model-item label="是否卫星仓客户" prop="satelliteFlag">
-                <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
-              </a-form-model-item> -->
-              <!--  <a-form-model-item label="是否为下级" prop="satelliteFlag">
-                <span style="padding-left: 11px;">{{ form.satelliteFlag == 1 ? '是' : '否' }}</span>
-              </a-form-model-item> -->
               <a-form-model-item label="客户关系" prop="relationTypeDictValue">
                 <span style="padding-left: 11px;">{{ form.relationTypeDictValue || '--' }}</span>
               </a-form-model-item>
@@ -157,7 +162,7 @@ export default {
         priceType: '', //  价格类型
         settleStyleSn: undefined //  收款方式
       },
-      areaVal:[],
+      areaVal: [],
       rules: {
         customerName: [{ required: true, message: '请输入客户名称', trigger: 'blur' }],
         contactMobile: [{ required: false, pattern: /^\d{11}$/, message: '请输入正确的手机号', trigger: 'blur' }],
@@ -179,7 +184,7 @@ export default {
       str = str.replace(/[\r\n]/g, '')
       this.form.customerName = str
     },
-    areaChange (val,opts) {
+    areaChange (val, opts) {
       console.log(opts)
       this.form.provinceSn = val[0] ? val[0] : undefined
       this.form.provinceName = opts[0] ? opts[0].name : ''
@@ -194,7 +199,7 @@ export default {
         if (res.status == 200) {
           res.data.satelliteFlag = res.data.dealerFlag
           this.form = Object.assign(this.form, res.data)
-          this.areaVal = [res.data.provinceSn,res.data.citySn,res.data.countySn]
+          this.areaVal = [res.data.provinceSn, res.data.citySn, res.data.countySn]
         } else {
           this.$refs.ruleForm.resetFields()
         }

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

@@ -20,12 +20,12 @@
                 <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <a-form-item label="审核时间">
+                <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
+              </a-form-item>
+            </a-col>
             <template v-if="advanced">
-              <a-col :md="6" :sm="24">
-                <a-form-item label="审核时间">
-                  <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
-                </a-form-item>
-              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="出库时间">
                   <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
@@ -86,9 +86,13 @@
                   <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
                 </a-form-model-item>
               </a-col>
-
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="searchForm">查询</a-button>
                 <a-button style="margin-left: 5px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
@@ -341,6 +345,7 @@ export default {
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
         { 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: '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: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },

+ 45 - 37
src/views/salesManagement/salesQueryNew/list.vue

@@ -47,43 +47,50 @@
                 <a-input id="salesManagementList-salesBillNo" v-model.trim="queryParam.salesBillNo" allowClear placeholder="请输入销售单号"/>
               </a-form-item>
             </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="单据来源">
-                <v-select
-                  v-model="queryParam.sourceType"
-                  ref="sourceType"
-                  id="salesManagementList-sourceType"
-                  code="SALES_SOURCE"
-                  placeholder="请选择单据来源"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="财务状态">
-                <v-select
-                  v-model="queryParam.financialStatus"
-                  ref="financialStatus"
-                  id="salesManagementList-financialStatus"
-                  code="FINANCIAL_RECEIVE_STATUS"
-                  placeholder="请选择财务状态"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="出库时间">
-                <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
-              </a-form-item>
-            </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-item label="采购单号">
-                <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
-              </a-form-item>
-            </a-col>
-            <a-col :span="6" v-if="advanced">
-              <a-form-model-item label="铺货出库">
-                <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
-              </a-form-model-item>
-            </a-col>
+            <template v-if="advanced">
+              <a-col :span="6" >
+                <a-form-item label="单据来源">
+                  <v-select
+                    v-model="queryParam.sourceType"
+                    ref="sourceType"
+                    id="salesManagementList-sourceType"
+                    code="SALES_SOURCE"
+                    placeholder="请选择单据来源"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item label="财务状态">
+                  <v-select
+                    v-model="queryParam.financialStatus"
+                    ref="financialStatus"
+                    id="salesManagementList-financialStatus"
+                    code="FINANCIAL_RECEIVE_STATUS"
+                    placeholder="请选择财务状态"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item label="出库时间">
+                  <rangeDate ref="outWareRangeDate" v-model="outWareTime" @change="outWareDateChange" />
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-item label="采购单号">
+                  <a-input id="salesManagementList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
+                </a-form-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-model-item label="铺货出库">
+                  <v-select code="FLAG" id="salesManagementList-distributionFlag" v-model="queryParam.distributionFlag" allowClear placeholder="请选择是否铺货出库"></v-select>
+                </a-form-model-item>
+              </a-col>
+              <a-col :span="6">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="salesManagementList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
+            </template>
             <a-col :span="24" style="display:flex;align-items: center;">
               <div style="text-align:left;width:50%;">
                 <a-checkbox v-model="isByCustQuery" id="sales-byCustQuery">按客户查询</a-checkbox>
@@ -341,6 +348,7 @@ export default {
         { title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { 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: 'relationTypeDictValue', 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: '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) : '--') } },

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

@@ -37,6 +37,11 @@
                     allowClear></v-select>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="客户关系">
+                  <v-select code="CUSTOMER_RELATION_TYPE" id="chainTransferOutList-relationType" v-model="queryParam.relationType" allowClear placeholder="请选择客户关系"></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -172,6 +177,7 @@ export default {
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售退货单号', scopedSlots: { customRender: 'salesReturnNo' }, width: '15%', align: 'center' },
         { 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: '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: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },