chenrui 1 rok pred
rodič
commit
69be67b02a

+ 17 - 4
src/views/customerManagement/customerInfo/list.vue

@@ -22,10 +22,21 @@
             </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
+                <a-form-item label="客户关系">
+                  <v-select
+                    code="CUSTOMER_RELATION_TYPE"
+                    id="customerManagementList-relationType"
+                    v-model="queryParam.relationType"
+                    allowClear
+                    placeholder="请选择客户关系"
+                  ></v-select>
+                </a-form-item>
+              </a-col>
+              <!--  <a-col :md="6" :sm="24">
                 <a-form-item label="是否为下级">
                   <v-select code="FLAG" id="customerManagementList-dealerFlag" v-model="queryParam.dealerFlag" allowClear placeholder="请选择"></v-select>
                 </a-form-item>
-              </a-col>
+              </a-col> -->
               <a-col :md="12" :sm="24">
                 <a-row>
                   <!-- 客户地址 -->
@@ -152,7 +163,8 @@ export default {
         citySn: undefined, //  市
         countySn: undefined, //  区
         dealerFlag: undefined, //  是否卫星仓客户
-        customerTypeSn: undefined //  客户类型
+        customerTypeSn: undefined, //  客户类型
+        relationType: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
@@ -163,8 +175,8 @@ export default {
         { title: '联系手机', dataIndex: 'contactMobile', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '最后销售时间', dataIndex: 'lastSaleTime', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户关系', dataIndex: 'customerType', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户关系', dataIndex: 'relationTypeDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        // { title: '是否为下级', dataIndex: 'dealerFlagDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '启用禁用', scopedSlots: { customRender: 'enableAction' }, width: '8%', align: 'center' },
         { title: <div><a-tooltip placement='top' title='注意:客户合并功能中,将以当前客户为对象,合并被选客户。'><a-icon type="question-circle" /></a-tooltip>&nbsp;操作</div>, scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
@@ -214,6 +226,7 @@ export default {
       this.queryParam.countySn = undefined
       this.queryParam.dealerFlag = undefined
       this.queryParam.customerTypeSn = undefined
+      this.queryParam.relationType = undefined
       this.addrCityList = []
       this.addrDistrictList = []
       this.$refs.table.refresh(true)

+ 8 - 1
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -196,7 +196,14 @@ export default {
       }
       purchaseTargetList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
-          this.purchaseTragetType = res.data
+          const purchaseList = res.data
+          purchaseList.map(item => {
+            if (item.purchaseTargetType === 'DEALER_SUPPLIER') {
+              item.purchaseTargetName += '(省仓经销商)'
+            }
+            return item
+          })
+          this.purchaseTragetType = purchaseList
         } else {
           this.purchaseTragetType = []
         }

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

@@ -371,7 +371,7 @@ export default {
   },
   computed: {
     isDealerUp () {
-      return this.detail && this.detail.purchaseTargetType == 'DEALER_UP'
+      return this.detail && (this.detail.purchaseTargetType == 'DEALER_UP' || this.detail.purchaseTargetType == 'DEALER_SUPPLIER')
     },
     columns () {
       const _this = this

+ 8 - 1
src/views/purchasingManagement/purchaseOrderNew/basicInfoModal.vue

@@ -196,7 +196,14 @@ export default {
       }
       purchaseTargetList(params).then(res => {
         if (res.status == 200 && res.data[0]) {
-          this.purchaseTragetType = res.data
+          const purchaseList = res.data
+          purchaseList.map(item => {
+            if (item.purchaseTargetType === 'DEALER_SUPPLIER') {
+              item.purchaseTargetName += '(省仓经销商)'
+            }
+            return item
+          })
+          this.purchaseTragetType = purchaseList
         } else {
           this.purchaseTragetType = []
         }

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

@@ -123,12 +123,12 @@
         </div>
         <div>
           <a-dropdown v-model="showCell">
-              <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
-              <a-menu slot="overlay">
-                <a-menu-item>
-                  <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
-                </a-menu-item>
-              </a-menu>
+            <a-button type="link" class="button-default"> <a-icon type="setting" />  显示</a-button>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
+              </a-menu-item>
+            </a-menu>
           </a-dropdown>
         </div>
       </div>
@@ -213,7 +213,7 @@
             size="small"
             type="link"
             class="button-primary"
-            v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
             @click="handleEdit(record)"
           >
             改单
@@ -222,12 +222,14 @@
             size="small"
             type="link"
             class="button-error"
-            v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
+            v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
             @click="handleDel(record, 'cancel')"
           >
             取消
           </a-button>
-          <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+          <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
+            <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+          </span>
         </template>
       </s-table>
     </a-spin>
@@ -328,8 +330,8 @@ export default {
       distributionFlag: '0'
     }
   },
-  computed:{
-    columns(){
+  computed: {
+    columns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
@@ -352,7 +354,7 @@ export default {
         // { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-    
+
       // 显示折扣
       if (this.showDiscount) {
         arr.splice(7, 0, { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })

+ 63 - 61
src/views/salesManagement/salesQueryNew/list.vue

@@ -16,74 +16,74 @@
               </a-form-item>
             </a-col>
             <a-col :span="6" v-if="advanced">
-                <a-form-item label="收款方式">
-                  <v-select
-                    code="SETTLE_STYLE"
-                    id="salesManagementList-settleStyleSn"
-                    v-model="queryParam.settleStyleSn"
-                    allowClear
-                    placeholder="请选择收款方式"
-                  ></v-select>
-                </a-form-item>
-              </a-col>
-              <a-col :span="6" v-if="advanced">
-                <a-form-item label="业务状态">
-                  <v-select
-                    v-model="queryParam.billStatus"
-                    ref="billStatus"
-                    id="salesManagementList-billStatus"
-                    code="SALES_BILL_STATUS"
-                    placeholder="请选择业务状态"
-                    allowClear></v-select>
-                </a-form-item>
-              </a-col>
+              <a-form-item label="收款方式">
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="salesManagementList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" v-if="advanced">
+              <a-form-item label="业务状态">
+                <v-select
+                  v-model="queryParam.billStatus"
+                  ref="billStatus"
+                  id="salesManagementList-billStatus"
+                  code="SALES_BILL_STATUS"
+                  placeholder="请选择业务状态"
+                  allowClear></v-select>
+              </a-form-item>
+            </a-col>
             <a-col :span="6">
               <a-form-item label="审核时间">
                 <rangeDate ref="auditRangeDate" v-model="auditTime" @change="auditDateChange" />
               </a-form-item>
             </a-col>
-              <a-col :span="6">
+            <a-col :span="6">
               <a-form-item label="销售单号">
                 <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="单据来源">
+                <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>
+            <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>
             <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>
@@ -136,7 +136,7 @@
                   <a-checkbox v-model="showDiscount" id="salesQuery-edit-discount">折后总售价</a-checkbox>
                 </a-menu-item>
               </a-menu>
-          </a-dropdown>
+            </a-dropdown>
           </div>
         </div>
 
@@ -213,7 +213,7 @@
               size="small"
               type="link"
               class="button-primary"
-              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')"
               @click="handleEdit(record)"
             >
               改单
@@ -222,12 +222,14 @@
               size="small"
               type="link"
               class="button-error"
-              v-if="(record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
+              v-if="((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel')"
               @click="handleDel(record, 'cancel')"
             >
               取消
             </a-button>
-            <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesEdit')) && !((record.sourceType == 'PURCHASE' && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+            <span v-if="!(record.billStatus == 'WAIT_AUDIT' && $hasPermissions('B_salesAudit')) && !(record.billStatus == 'WAIT_OUT_WAREHOUSE' && $hasPermissions('B_salesStockOut')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'WAIT_SUBMIT' || record.billStatus == 'AUDIT_REJECT')) && $hasPermissions('B_salesEdit')) && !(((record.sourceType == 'SATELLITE' || record.sourceType == 'SALES' || record.sourceType == 'TEMPORARY_DISPATCHING') && record.billStatus != 'FINISH') && $hasPermissions('B_salesDel'))">
+              <span v-if="!(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) &&$hasPermissions('B_salesEdit')) && !(((record.sourceType == 'CHILD_PURCHASE'||record.sourceType == 'DEALER_PURCHASE') && (record.billStatus == 'WAIT_AUDIT' || record.billStatus == 'SUPERIOR_CHANGE')) && $hasPermissions('B_salesDel'))">--</span>
+            </span>
           </template>
         </s-table>
       </a-spin>
@@ -329,8 +331,8 @@ export default {
       distributionFlag: '0'
     }
   },
-  computed:{
-    columns(){
+  computed: {
+    columns () {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
@@ -353,7 +355,7 @@ export default {
         // { title: '财务状态', dataIndex: 'financialStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
-    
+
       // 显示折扣
       if (this.showDiscount) {
         arr.splice(7, 0, { title: '折扣金额', dataIndex: 'discountAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })