Przeglądaj źródła

收款方式修改

lilei 3 lat temu
rodzic
commit
39a0918764

+ 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 - 4
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>
@@ -131,7 +135,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 => {

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

@@ -121,14 +121,14 @@
                 </a-col>
                 <a-col span="12">
                   <a-form-model-item label="结算方式" prop="settleStyleSn">
-					<v-select
-					code="SETTLE_STYLE" 
-					id="collectionPayment-settleStyleSn" 
-					v-model="form.settleStyleSn" 
-					@change="settleStyleChange"
-					allowClear 
-					placeholder="请选择结算方式" 
-					></v-select>
+                    <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">
@@ -285,7 +285,7 @@ export default {
     },
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
     },
     settleAccountChange (v, name) {
       this.form.settleAccountName = name

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

@@ -44,14 +44,14 @@
           </a-form-model-item>
           <a-form-model-item label="结算方式" prop="settleStyleSn">
-			<v-select
-			code="SETTLE_STYLE" 
-			id="expenseManagementEdit-settleStyleSn" 
-			v-model="form.settleStyleSn" 
-			@change="settleStyleChange"
-			allowClear 
-			placeholder="请选择结算方式" 
-			></v-select>
+            <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
@@ -121,7 +121,7 @@ export default {
     ...mapActions(['GetSettleAccountState']),
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
     },
     //  递归函数
     recursionFun (data) {

+ 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 || '--' } },

+ 1 - 1
src/views/financialManagement/fundAccountManagement/addModal.vue

@@ -106,7 +106,7 @@ export default {
       this.isEdit = false
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
     },
     //  保存
     handleSubmit (e) {

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

@@ -27,14 +27,14 @@
           </span>
         </a-form-model-item>
         <a-form-model-item label="结算方式" prop="settleStyleSn">
-		  <v-select
-		  code="SETTLE_STYLE" 
-		  id="expenseManagementEdit-settleStyleSn" 
-		  v-model="form.settleStyleSn" 
-		  @change="settleStyleChange"
-		  allowClear 
-		  placeholder="请选择结算方式" 
-		  ></v-select>
+          <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
@@ -101,7 +101,7 @@ export default {
       }
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      this.form.settleStyleName = name.dispName
     },
     //  保存
     handleSubmit (e) {

+ 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="收货地址">

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

@@ -232,7 +232,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 || '--' } },

+ 1 - 1
src/views/reportData/chainSalesReport/list.vue

@@ -167,7 +167,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 : '--') } },

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

@@ -226,7 +226,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 || '--' } },

+ 1 - 1
src/views/reportData/salesReport/list.vue

@@ -161,7 +161,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 : '--') } },

+ 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>

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

@@ -28,13 +28,13 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="收款方式">
-				  <v-select 
-				  code="SETTLE_STYLE" 
-				  id="salesManagementList-settleStyleSn" 
-				  v-model="queryParam.settleStyleSn" 
-				  allowClear 
-				  placeholder="请选择收款方式" 
-				  ></v-select>
+                  <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">
@@ -246,7 +246,7 @@ export default {
         { 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: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '收款方式', dataIndex: 'settleStyleEntity.name', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },

+ 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>