lilei hace 3 años
padre
commit
a88e196878

+ 1 - 1
src/views/customerManagement/customerInfo/detailModal.vue

@@ -21,7 +21,7 @@
           <a-descriptions-item label="配送方式:">{{ detailData&&detailData.dispatchTypeDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="是否卫星仓客户:">{{ detailData&&detailData.satelliteFlagDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="价格类型:">{{ detailData&&detailData.priceTypeDictValue || '--' }}</a-descriptions-item>
-          <a-descriptions-item label="收款方式:">{{ detailData&&detailData.settleStyleName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="收款方式:">{{ detailData&&detailData.settleStyleSnDictValue || '--' }}</a-descriptions-item>
           <a-descriptions-item label="客户类型:">{{ detailData&&detailData.customerTypeName || '--' }}</a-descriptions-item>
         </a-descriptions>
       </a-spin>

+ 3 - 17
src/views/customerManagement/customerInfo/edit.vue

@@ -110,9 +110,7 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item label="收款方式" prop="settleStyleSn">
-                <a-select id="customerManagementEdit-settleStyleSn" v-model="form.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="customerManagementEdit-settleStyleSn" v-model="form.settleStyleSn" allowClear placeholder="请选择收款方式" ></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
@@ -135,7 +133,7 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { getArea } from '@/api/data'
 import custType from '@/views/common/custType.js'
-import { custSave, custFindById, settleStyleFindAllList } from '@/api/customer'
+import { custSave, custFindById } from '@/api/customer'
 export default {
   name: 'CustomerManagementEdit',
   components: { STable, VSelect, custType },
@@ -184,8 +182,7 @@ export default {
       },
       addrProvinceList: [], //  省下拉
       addrCityList: [], //  市下拉
-      addrDistrictList: [], //  区下拉
-      settleStyleList: [] //  收款方式  下拉数据
+      addrDistrictList: [] //  区下拉
     }
   },
   methods: {
@@ -208,16 +205,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     //  保存
     handleSubmit (e) {
       e.preventDefault()
@@ -315,7 +302,6 @@ export default {
     // 获取基础数据
     getBaseData () {
       this.getArea('province') //  省市区
-      this.getSettleStyleList() // 收款方式
       this.$refs.ruleForm.resetFields()
     },
     initPage () {

+ 9 - 8
src/views/financialManagement/companyReceivablePayable/collectionPayment.vue

@@ -121,12 +121,14 @@
                 </a-col>
                 <a-col span="12">
                   <a-form-model-item label="结算方式" prop="settleStyleSn">
-                    <settleStyle
-                      id="collectionPayment-settleStyleSn"
-                      v-model="form.settleStyleSn"
-                      @change="settleStyleChange"
-                      placeholder="请选择结算方式">
-                    </settleStyle>
+					<v-select
+					code="SETTLE_STYLE" 
+					id="collectionPayment-settleStyleSn" 
+					v-model="form.settleStyleSn" 
+					@change="settleStyleChange"
+					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)

+ 9 - 8
src/views/financialManagement/expenseManagement/edit.vue

@@ -44,12 +44,14 @@
           </a-form-model-item>
           <a-form-model-item label="结算方式" prop="settleStyleSn">
-            <settleStyle
-              id="expenseManagementEdit-settleStyleSn"
-              v-model="form.settleStyleSn"
-              @change="settleStyleChange"
-              placeholder="请选择结算方式">
-            </settleStyle>
+			<v-select
+			code="SETTLE_STYLE" 
+			id="expenseManagementEdit-settleStyleSn" 
+			v-model="form.settleStyleSn" 
+			@change="settleStyleChange"
+			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 {

+ 9 - 8
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
-            id="fundAount-settleStyleSn"
-            v-model="form.settleStyleSn"
-            @change="settleStyleChange"
-            placeholder="请选择账户类型">
-          </settleStyle>
+		  <v-select
+		  code="SETTLE_STYLE" 
+		  id="fundAount-settleStyleSn" 
+		  v-model="form.settleStyleSn" 
+		  @change="settleStyleChange"
+		  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: { //  弹框显示状态

+ 9 - 8
src/views/financialManagement/settleModal/settleModal.vue

@@ -27,12 +27,14 @@
           </span>
         </a-form-model-item>
         <a-form-model-item label="结算方式" prop="settleStyleSn">
-          <settleStyle
-            id="expenseManagementEdit-settleStyleSn"
-            v-model="form.settleStyleSn"
-            @change="settleStyleChange"
-            placeholder="请选择结算方式">
-          </settleStyle>
+		  <v-select
+		  code="SETTLE_STYLE" 
+		  id="expenseManagementEdit-settleStyleSn" 
+		  v-model="form.settleStyleSn" 
+		  @change="settleStyleChange"
+		  allowClear 
+		  placeholder="请选择结算方式" 
+		  ></v-select>
         </a-form-model-item>
         <a-form-model-item label="结算账户" prop="settleAccountSn">
           <settleAccount
@@ -54,11 +56,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: { //  弹框显示状态

+ 1 - 16
src/views/reportData/chainSalesDetailReport/list.vue

@@ -49,9 +49,7 @@
               </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">
@@ -185,7 +183,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 { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseCascadeList } from '@/api/warehouse'
@@ -275,7 +272,6 @@ export default {
       linkageGroupData: [],
       allocateTypeList: [], //  调拨类型
       custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [], //  收款方式  下拉数据
       productBrandList: [], //  品牌下拉数据
       productType: [],
       productTypeList: [], //  分类下拉数据
@@ -355,16 +351,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     //  产品品牌  列表
     getProductBrand () {
       dealerProductBrandQuery({}).then(res => {
@@ -484,7 +470,6 @@ export default {
       this.getLinkageGroup()
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
       this.getProductBrand()
       this.getProductType()
       this.getWarehouseCascade()

+ 2 - 17
src/views/reportData/chainSalesReport/list.vue

@@ -49,9 +49,7 @@
               </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">
@@ -134,7 +132,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 },
@@ -207,8 +204,7 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       allocateTypeList: [], //  调拨类型
-      custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [] //  收款方式  下拉数据
+      custTypeList: [] //  客户类型 下拉数据
     }
   },
   methods: {
@@ -274,16 +270,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     // 连锁店
     getLinkageGroup () {
       linkageGroupList({}).then(res => {
@@ -349,7 +335,6 @@ export default {
       this.getLinkageGroup()
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
     }
   },
   mounted () {

+ 1 - 16
src/views/reportData/salesDetailReport/list.vue

@@ -35,9 +35,7 @@
             <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">
@@ -181,7 +179,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 { dealerProductBrandQuery } from '@/api/dealerProductBrand'
 import { dealerProductTypeList } from '@/api/dealerProductType'
 import { warehouseCascadeList } from '@/api/warehouse'
@@ -269,7 +266,6 @@ export default {
       linkageGroupData: [],
       allocateTypeList: [], //  调拨类型
       custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [], //  收款方式  下拉数据
       productBrandList: [], //  品牌下拉数据
       productType: [],
       productTypeList: [], //  分类下拉数据
@@ -367,16 +363,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     //  产品品牌  列表
     getProductBrand () {
       dealerProductBrandQuery({}).then(res => {
@@ -482,7 +468,6 @@ export default {
       this.spinning = false
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
       this.getProductBrand()
       this.getProductType()
       this.getWarehouseCascade()

+ 2 - 17
src/views/reportData/salesReport/list.vue

@@ -35,9 +35,7 @@
             <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">
@@ -130,7 +128,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 },
@@ -201,8 +198,7 @@ export default {
       addrCityList: [], //  市下拉
       addrDistrictList: [], //  区下拉
       allocateTypeList: [], //  调拨类型
-      custTypeList: [], //  客户类型 下拉数据
-      settleStyleList: [] //  收款方式  下拉数据
+      custTypeList: [] //  客户类型 下拉数据
     }
   },
   methods: {
@@ -286,16 +282,6 @@ export default {
         }
       })
     },
-    // 收款方式
-    getSettleStyleList () {
-      settleStyleFindAllList().then(res => {
-        if (res.status == 200) {
-          this.settleStyleList = res.data
-        } else {
-          this.settleStyleList = []
-        }
-      })
-    },
     // 获取城市列表
     getCityList (val) {
       this.addrCityList = []
@@ -345,7 +331,6 @@ export default {
     pageInit () {
       this.getArea('province')
       this.getCustTypeList()
-      this.getSettleStyleList()
     }
   },
   mounted () {

+ 8 - 6
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -128,10 +128,13 @@
             </a-col>
             <a-col :span="8">
               <a-form-model-item label="收款方式" prop="settleStyleSn">
-                <settleStyle
-                  v-model="form.settleStyleSn"
-                  placeholder="请选择收款方式">
-                </settleStyle>
+				<v-select
+				code="SETTLE_STYLE" 
+				id="chooseCustom-settleStyleSn" 
+				v-model="form.settleStyleSn" 
+				allowClear 
+				placeholder="请选择收款方式" 
+				></v-select>
               </a-form-model-item>
             </a-col>
             <a-col :span="8">
@@ -197,13 +200,12 @@ import { getArea } from '@/api/data'
 import { custFindById, updateByCustomerSn } from '@/api/customer'
 import { salesSave } from '@/api/sales'
 import { employeeAllList } from '@/api/salesman'
-import settleStyle from '@/views/common/settleStyle'
 import { VSelect } from '@/components'
 import custList from '@/views/common/custList.vue'
 import CustomerManagementEdit from '@/views/customerManagement/customerInfo/edit.vue'
 export default {
   name: 'ChooseCustomModal',
-  components: { VSelect, CustomerManagementEdit, custList, settleStyle },
+  components: { VSelect, CustomerManagementEdit, custList },
   props: {
     show: [Boolean]
   },

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

@@ -28,11 +28,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
-                  <settleStyle
-                    id="salesManagementList-settleStyleSn"
-                    v-model="queryParam.settleStyleSn"
-                    placeholder="请选择收款方式">
-                  </settleStyle>
+				  <v-select 
+				  code="SETTLE_STYLE" 
+				  id="salesManagementList-settleStyleSn" 
+				  v-model="queryParam.settleStyleSn" 
+				  allowClear 
+				  placeholder="请选择收款方式" 
+				  ></v-select>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -197,14 +199,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 {