Browse Source

收款方式修改

lilei 3 years ago
parent
commit
2c210d9ada

+ 1 - 1
public/version.json

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

+ 8 - 17
src/views/chainReportData/chainSalesDetailReport/list.vue

@@ -48,9 +48,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
-                <a-select id="chainSalesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
-                  <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                </a-select>
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="chainSalesDetailReportList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -169,7 +173,6 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { getArea } from '@/api/data'
 import { custTypeFindAllList } from '@/api/custType'
-import { settleStyleFindAllList } from '@/api/customer'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import { warehouseCascadeList } from '@/api/warehouse'
@@ -245,7 +248,6 @@ export default {
       linkageGroupData: [],
       allocateTypeList: [], //  调拨类型
       custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [], //  收款方式  下拉数据
       productBrandList: [], //  品牌下拉数据
       productType: [],
       productTypeList: [], //  分类下拉数据
@@ -258,7 +260,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -348,16 +350,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productEntity.productTypeSn1 = val[0] ? val[0] : ''
@@ -457,7 +449,6 @@ export default {
       this.getLinkageGroup()
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
       this.getWarehouseCascade()
     }
   },

+ 9 - 18
src/views/chainReportData/chainSalesReport/list.vue

@@ -48,9 +48,13 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
-                <a-select id="chainSalesReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
-                  <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                </a-select>
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="chainSalesReportList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -136,7 +140,6 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { getArea } from '@/api/data'
 import { custTypeFindAllList } from '@/api/custType'
-import { settleStyleFindAllList } from '@/api/customer'
 import { reportChainSalesBillList, reportChainSalesBillCount, linkageGroupList } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
@@ -196,8 +199,7 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       allocateTypeList: [], //  调拨类型
-      custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [] //  收款方式  下拉数据
+      custTypeList: [] //  客户类型 下拉数据
     }
   },
   computed: {
@@ -206,7 +208,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -285,16 +287,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
@@ -360,7 +352,6 @@ export default {
       this.getLinkageGroup()
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
     }
   },
   mounted () {

+ 1 - 1
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -21,7 +21,7 @@
               <a-descriptions-item label="实结算金额">{{ (basicInfoData&&(basicInfoData.realSettleAmount || basicInfoData.realSettleAmount==0)) ? basicInfoData.realSettleAmount : '--' }}</a-descriptions-item>
               <a-descriptions-item label="结算时间">{{ (basicInfoData&&basicInfoData.createDate) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="操作人">{{ (basicInfoData&&basicInfoData.operateName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleName) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="结算方式">{{ (basicInfoData&&basicInfoData.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
             </a-descriptions>
           </a-collapse-panel>
         </a-collapse>

+ 8 - 17
src/views/financialManagement/companyCollectionPayment/list.vue

@@ -45,9 +45,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="结算方式">
-                  <a-select id="companyCollectionPaymentList-settleStyleSn" v-model="queryParam.settleStyleSn" placeholder="请选择结算方式" allowClear>
-                    <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                  </a-select>
+                  <v-select
+                    code="SETTLE_STYLE"
+                    id="companyCollectionPaymentList-settleStyleSn"
+                    v-model="queryParam.settleStyleSn"
+                    allowClear
+                    placeholder="请选择结算方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
             </template>
@@ -99,7 +103,6 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
-import { settleStyleQueryAll } from '@/api/settleStyle'
 import { settleUnitList, settleUnitQuerySum } from '@/api/settle'
 export default {
   name: 'CompanyCollectionPaymentList',
@@ -131,7 +134,7 @@ export default {
         { title: '结算金额', dataIndex: 'realSettleAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '结算时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作人', dataIndex: 'operateName', width: '14%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '结算方式', dataIndex: 'settleStyleName', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '结算方式', dataIndex: 'settleStyleSnDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
@@ -153,7 +156,6 @@ export default {
           return data
         })
       },
-      settleStyleList: [],
       total: 0, //  总条数
       productTotal: null
     }
@@ -194,22 +196,11 @@ export default {
       this.queryParam.settleStyleSn = undefined
       this.$refs.table.refresh(true)
     },
-    //  结算方式
-    getSettleStyle () {
-      settleStyleQueryAll({}).then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调
         _this.setTableH()
       })
-      this.getSettleStyle()
     },
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight

+ 7 - 6
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -121,12 +121,14 @@
                 </a-col>
                 <a-col span="12">
                   <a-form-model-item label="结算方式" prop="settleStyleSn">
-                    <settleStyle
+                    <v-select
+                      code="SETTLE_STYLE"
                       id="collectionPayment-settleStyleSn"
                       v-model="form.settleStyleSn"
                       @change="settleStyleChange"
-                      placeholder="请选择结算方式">
-                    </settleStyle>
+                      allowClear
+                      placeholder="请选择结算方式"
+                    ></v-select>
                   </a-form-model-item>
                 </a-col>
                 <a-col span="12">
@@ -180,12 +182,11 @@ import { STable, VSelect } from '@/components'
 import chooseBillModal from './chooseBillModal.vue'
 import { settleUnitSave, settleUnitPrint, settleUnitExport, settleInfoAllList } from '@/api/settle'
 import Print from '@/views/common/print.vue'
-import settleStyle from '@/views/common/settleStyle'
 import settleAccount from '@/views/common/settleAccount'
 import { hdPrint } from '@/libs/JGPrint'
 export default {
   name: 'CollectionPaymentDetail',
-  components: { STable, VSelect, chooseBillModal, Print, settleStyle, settleAccount },
+  components: { STable, VSelect, chooseBillModal, Print, settleAccount },
   mixins: [commonMixin],
   data () {
     this.amountSettledChange = debounce(this.amountSettledChange, 800)
@@ -284,7 +285,7 @@ export default {
     },
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
       if (this.form.settleAccountSn) {
         this.form.settleAccountSn = undefined
       }

+ 7 - 6
src/views/financialManagement/expenseManagement/edit.vue

@@ -44,12 +44,14 @@
           </a-form-model-item>
           <a-form-model-item label="结算方式" prop="settleStyleSn">
-            <settleStyle
+            <v-select
+              code="SETTLE_STYLE"
               id="expenseManagementEdit-settleStyleSn"
               v-model="form.settleStyleSn"
               @change="settleStyleChange"
-              placeholder="请选择结算方式">
-            </settleStyle>
+              allowClear
+              placeholder="请选择结算方式"
+            ></v-select>
           </a-form-model-item>
           <a-form-model-item v-if="enableFundAccount" label="结算账户" prop="settleAccountSn">
             <settleAccount
@@ -81,11 +83,10 @@ import { mapActions } from 'vuex'
 import { STable, VSelect } from '@/components'
 import { settleExpenseSave, findExpenseDetail } from '@/api/settleExpense'
 import { costTypeAllQuery } from '@/api/costType'
-import settleStyle from '@/views/common/settleStyle'
 import settleAccount from '@/views/common/settleAccount'
 export default {
   name: 'ExpenseManagementEdit',
-  components: { STable, VSelect, settleStyle, settleAccount },
+  components: { STable, VSelect, settleAccount },
   mixins: [commonMixin],
   data () {
     return {
@@ -120,7 +121,7 @@ export default {
     ...mapActions(['GetSettleAccountState']),
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
       if (this.form.settleAccountSn) {
         this.form.settleAccountSn = undefined
       }

+ 1 - 1
src/views/financialManagement/financialCollection/detailModal.vue

@@ -16,7 +16,7 @@
         <a-descriptions-item label="商户名称">{{ detailsData&&detailsData.settleClientName || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款金额">{{ detailsData&&(detailsData.settledAmount || detailsData.settledAmount==0) ? '¥'+ detailsData.settledAmount : '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款类型">{{ detailsData&&detailsData.bizTypeDictValue || '--' }}</a-descriptions-item>
-        <a-descriptions-item label="收款方式">{{ detailsData&&detailsData.settleStyleName || '--' }}</a-descriptions-item>
+        <a-descriptions-item label="收款方式">{{ detailsData&&detailsData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
         <a-descriptions-item label="收款时间">{{ detailsData&&detailsData.settleTime || '--' }}</a-descriptions-item>
         <a-descriptions-item label="审核时间">{{ detailsData&&detailsData.auditTime || '--' }}</a-descriptions-item>
       </a-descriptions>

+ 1 - 1
src/views/financialManagement/financialCollection/list.vue

@@ -215,7 +215,7 @@ export default {
         { title: '已收金额', dataIndex: 'settledAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '待收金额', dataIndex: 'unsettleAmount', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? ('¥' + text) : '--') } },
         { title: '收款类型', dataIndex: 'bizName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         // { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '收款时间', dataIndex: 'settleTime', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },

+ 7 - 6
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -17,12 +17,14 @@
         :label-col="formItemLayout.labelCol"
         :wrapper-col="formItemLayout.wrapperCol" >
         <a-form-model-item label="账户类型" prop="settleStyleSn">
-          <settleStyle
+          <v-select
+            code="SETTLE_STYLE"
             id="fundAount-settleStyleSn"
             v-model="form.settleStyleSn"
             @change="settleStyleChange"
-            placeholder="请选择账户类型">
-          </settleStyle>
+            allowClear
+            placeholder="请选择账户类型"
+          ></v-select>
         </a-form-model-item>
         <a-form-model-item label="账户名称" prop="accountName">
           <a-input
@@ -53,10 +55,9 @@
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import { settleAccountSave, settleAccountDetail } from '@/api/settleAcount'
-import settleStyle from '@/views/common/settleStyle'
 export default {
   name: 'BasicInfoModal',
-  components: { VSelect, settleStyle },
+  components: { VSelect },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -105,7 +106,7 @@ export default {
       this.isEdit = false
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
     },
     //  保存
     handleSubmit (e) {

+ 7 - 7
src/views/financialManagement/settleModal/settleModal.vue

@@ -27,12 +27,13 @@
           </span>
         </a-form-model-item>
         <a-form-model-item label="结算方式" prop="settleStyleSn">
-          <settleStyle
+          <v-select
+            code="SETTLE_STYLE"
             id="expenseManagementEdit-settleStyleSn"
             v-model="form.settleStyleSn"
-            @change="settleStyleChange"
-            placeholder="请选择结算方式">
-          </settleStyle>
+            allowClear
+            placeholder="请选择结算方式"
+          ></v-select>
         </a-form-model-item>
         <a-form-model-item label="结算账户" prop="settleAccountSn">
           <settleAccount
@@ -54,11 +55,10 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import settleStyle from '@/views/common/settleStyle'
 import settleAccount from '@/views/common/settleAccount'
 export default {
   name: 'SettleModal',
-  components: { settleStyle, settleAccount },
+  components: { settleAccount },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -100,7 +100,7 @@ export default {
       }
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
       if (this.form.settleAccountSn) {
         this.form.settleAccountSn = undefined
       }

+ 7 - 16
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -28,11 +28,13 @@
           <span v-else>没有可选择的供应商</span>
         </a-form-model-item>
         <a-form-model-item label="支付方式" prop="settleStyleSn">
-          <a-select placeholder="请选择支付方式" v-model="form.settleStyleSn">
-            <a-select-option v-for="item in settleStyleList" :key="item.settleStyleSn" :value="item.settleStyleSn">
-              {{ item.name }}
-            </a-select-option>
-          </a-select>
+          <v-select
+            code="SETTLE_STYLE"
+            id="purchaseOrder-basicInfo-settleStyleSn"
+            v-model="form.settleStyleSn"
+            allowClear
+            placeholder="请选择支付方式"
+          ></v-select>
         </a-form-model-item>
         <a-form-model-item label="收货地址" prop="consigneeTel">
           {{ chooseAddr }}
@@ -53,7 +55,6 @@
 import { commonMixin } from '@/utils/mixin'
 import { VSelect } from '@/components'
 import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
-import { settleStyleQueryAll } from '@/api/settleStyle'
 import { shippingAddressQuery } from '@/api/shippingAddress'
 import { purchaseSave, purchaseTargetList } from '@/api/purchase'
 export default {
@@ -71,7 +72,6 @@ export default {
       spinning: false,
       confirmLoading: false,
       isShow: this.openModal, //  是否打开弹框
-      settleStyleList: [], // 支付方式
       formItemLayout: {
         labelCol: { span: 4 },
         wrapperCol: { span: 18 }
@@ -178,14 +178,6 @@ export default {
       this.chooseAddr = data.consigneeName + '(' + (data.consigneeTel || '--') + ')' + ' ' + data.shippingAddressProvinceName + '-' + data.shippingAddressCityName + '-' + data.shippingAddressCountyName + ' ' + data.shippingAddress
       this.addressVal = '更换地址'
     },
-    // 获取收款方式
-    getSettleStyle () {
-      settleStyleQueryAll().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        }
-      })
-    },
     getParentDealer () {
       const zb = this.$hasPermissions('B_SUPPLIER_ZB')
       const sj = this.$hasPermissions('B_SUPPLIER_SJ')
@@ -256,7 +248,6 @@ export default {
         this.$emit('close')
         this.resetForm()
       } else {
-        this.getSettleStyle()
         this.getParentDealer()
         this.getDefaultAddress()
       }

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

@@ -29,7 +29,7 @@
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
               <a-descriptions-item label="供应商">{{ (detail&&detail.purchaseTargetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="支付方式">{{ (detail&&detail.settleStyleEntity&&detail.settleStyleEntity.name) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="支付方式">{{ (detail&&detail.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购员工" v-if="detail&&detail.purchaseBillSource=='PURCHASE'">{{ detail&&detail.operatorName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货人">{{ detail&&detail.consigneeName || '--' }}<span v-if="detail&&detail.consigneeTel">({{ detail&&detail.consigneeTel }})</span></a-descriptions-item>
               <a-descriptions-item label="收货地址">

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

@@ -21,7 +21,7 @@
             </template>
             <a-descriptions :column="2">
               <a-descriptions-item label="供应商">{{ detail&&detail.purchaseTargetName || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="支付方式">{{ detail&&detail.settleStyleEntity&&detail.settleStyleEntity.name || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="支付方式">{{ detail&&detail.settleStyleSnDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货人">{{ detail&&detail.consigneeName || '--' }}({{ detail&&detail.consigneeTel || '--' }})</a-descriptions-item>
               <a-descriptions-item label="收货地址">
                 <div v-if="detail&&(detail.shippingAddressProvinceName || detail.shippingAddressCityName || detail.shippingAddressCountyName || detail.shippingAddress)">

+ 1 - 1
src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue

@@ -29,7 +29,7 @@
           <a-collapse-panel key="1" header="基础信息">
             <a-descriptions :column="3">
               <a-descriptions-item label="供应商">{{ (detail&&detail.purchaseTargetName) || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="支付方式">{{ (detail&&detail.purchaseBill&&detail.purchaseBill.settleStyleEntity&&detail.purchaseBill.settleStyleEntity.name) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="支付方式">{{ (detail&&detail.purchaseBill&&detail.purchaseBill.settleStyleSnDictValue) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="采购员工" v-if="detail&&detail.purchaseBill&&detail.purchaseBill.purchaseBillSource=='PURCHASE'">{{ detail&&detail.purchaseBill&&detail.purchaseBill.operatorName || '--' }}</a-descriptions-item>
               <a-descriptions-item label="收货人">{{ detail&&detail.purchaseBill&&detail.purchaseBill.consigneeName || '--' }}<span v-if="detail&&detail.purchaseBill&&detail.purchaseBill.consigneeTel">({{ detail&&detail.purchaseBill&&detail.purchaseBill.consigneeTel }})</span></a-descriptions-item>
               <a-descriptions-item label="收货地址">

+ 8 - 17
src/views/reportData/salesDetailReport/list.vue

@@ -34,9 +34,13 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
-                <a-select id="salesDetailReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
-                  <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                </a-select>
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="salesDetailReportList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -165,7 +169,6 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { getArea } from '@/api/data'
 import { custTypeFindAllList } from '@/api/custType'
-import { settleStyleFindAllList } from '@/api/customer'
 import { warehouseCascadeList } from '@/api/warehouse'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
@@ -239,7 +242,6 @@ export default {
       linkageGroupData: [],
       allocateTypeList: [], //  调拨类型
       custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [], //  收款方式  下拉数据
       productType: [],
       warehouseCascadeData: [] //  仓库仓位
     }
@@ -250,7 +252,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '13%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productEntity.name', width: '14%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'productEntity.unit', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -359,16 +361,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     //  产品分类  change
     changeProductType (val, opt) {
       this.queryParam.productEntity.productTypeSn1 = val[0] ? val[0] : ''
@@ -454,7 +446,6 @@ export default {
       this.spinning = false
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
       this.getWarehouseCascade()
     }
   },

+ 9 - 18
src/views/reportData/salesReport/list.vue

@@ -34,9 +34,13 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-model-item label="收款方式">
-                <a-select id="salesReportList-settleStyleSn" v-model="queryParam.settleStyleSn" allowClear placeholder="请选择收款方式">
-                  <a-select-option v-for="item in settleStyleList" :value="item.settleStyleSn" :key="item.settleStyleSn">{{ item.name }}</a-select-option>
-                </a-select>
+                <v-select
+                  code="SETTLE_STYLE"
+                  id="salesReportList-settleStyleSn"
+                  v-model="queryParam.settleStyleSn"
+                  allowClear
+                  placeholder="请选择收款方式"
+                ></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -132,7 +136,6 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import { getArea } from '@/api/data'
 import { custTypeFindAllList } from '@/api/custType'
-import { settleStyleFindAllList } from '@/api/customer'
 import { reportSalesBillList, reportSalesBillCount, reportSalesBillExport } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
@@ -190,8 +193,7 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       allocateTypeList: [], //  调拨类型
-      custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [] //  收款方式  下拉数据
+      custTypeList: [] //  客户类型 下拉数据
     }
   },
   computed: {
@@ -200,7 +202,7 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '销售单号', dataIndex: 'salesBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'salesTargetName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收款方式', dataIndex: 'settleStyleName', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -298,16 +300,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     // 获取城市列表
     getCityList (val) {
       this.addrCityList = []
@@ -357,7 +349,6 @@ export default {
     pageInit () {
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
     }
   },
   mounted () {

+ 1 - 1
src/views/salesManagement/salesQuery/detail.vue

@@ -32,7 +32,7 @@
                 </div>
                 <span v-else>--</span>
               </a-descriptions-item>
-              <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleEntity&&detailData.settleStyleEntity.name || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="联系电话">{{ detailData&&detailData.consigneeTel || '--' }}</a-descriptions-item>
               <a-descriptions-item label="备注">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
               <a-descriptions-item label="销售单号">{{ detailData&&detailData.salesBillNo || '--' }}</a-descriptions-item>

+ 6 - 5
src/views/salesManagement/salesQuery/list.vue

@@ -34,11 +34,13 @@
             <template v-if="advanced">
               <a-col :md="4" :sm="24">
                 <a-form-item label="收款方式">
-                  <settleStyle
+                  <v-select
+                    code="SETTLE_STYLE"
                     id="salesManagementList-settleStyleSn"
                     v-model="queryParam.settleStyleSn"
-                    placeholder="请选择收款方式">
-                  </settleStyle>
+                    allowClear
+                    placeholder="请选择收款方式"
+                  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="4" :sm="24">
@@ -208,14 +210,13 @@ import { STable, VSelect } from '@/components'
 import chooseCustomModal from './chooseCustomModal.vue'
 import auditModal from '@/views/common/auditModal.vue'
 import { salesList, salesDel, salesWriteAudit, salesWriteStockOut, salesCount, salesExport } from '@/api/sales'
-import settleStyle from '@/views/common/settleStyle'
 import rangeDate from '@/views/common/rangeDate.vue'
 import custList from '@/views/common/custList.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
 import stateIcon from '@/views/common/stateIcon'
 export default {
   name: 'SalesList',
-  components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon, settleStyle },
+  components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
   mixins: [commonMixin],
   data () {
     return {

+ 1 - 1
src/views/salesManagement/urgentItemsOffset/detail.vue

@@ -24,7 +24,7 @@
                 <span v-else>--</span>
               </a-descriptions-item>
               <a-descriptions-item label="联系电话">{{ detailData&&detailData.consigneeTel || '--' }}</a-descriptions-item>
-              <a-descriptions-item label="收款方式">{{ (detailData&&detailData.settleStyleEntity&&detailData.settleStyleEntity.name) || '--' }}</a-descriptions-item>
+              <a-descriptions-item label="收款方式">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
               <a-descriptions-item label="急件单号">{{ (detailData&&detailData.urgentBillNo) || '--' }}</a-descriptions-item>
               <a-descriptions-item label="状态">{{ (detailData&&detailData.statusDictValue) || '--' }}</a-descriptions-item>
             </a-descriptions>