浏览代码

Merge branch 'develop_xnyh02' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into pre-release

lilei 3 年之前
父节点
当前提交
70dba46b5a
共有 27 个文件被更改,包括 127 次插入164 次删除
  1. 2 2
      public/version.json
  2. 7 1
      src/views/Home.vue
  3. 9 1
      src/views/common/settleAccount.js
  4. 1 1
      src/views/customerManagement/customerInfo/detailModal.vue
  5. 3 17
      src/views/customerManagement/customerInfo/edit.vue
  6. 1 1
      src/views/financialManagement/companyCollectionPayment/detail.vue
  7. 8 4
      src/views/financialManagement/companyCollectionPayment/list.vue
  8. 10 6
      src/views/financialManagement/companyReceivablePayable/collectionPayment.vue
  9. 14 6
      src/views/financialManagement/expenseManagement/edit.vue
  10. 1 1
      src/views/financialManagement/financialCollection/detailModal.vue
  11. 1 1
      src/views/financialManagement/financialCollection/list.vue
  12. 9 6
      src/views/financialManagement/fundAccountManagement/addModal.vue
  13. 10 6
      src/views/financialManagement/settleModal/settleModal.vue
  14. 7 16
      src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue
  15. 1 1
      src/views/purchasingManagement/purchaseOrder/detail.vue
  16. 1 1
      src/views/purchasingManagement/purchaseOrder/edit.vue
  17. 1 1
      src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue
  18. 2 17
      src/views/reportData/chainSalesDetailReport/list.vue
  19. 3 18
      src/views/reportData/chainSalesReport/list.vue
  20. 2 17
      src/views/reportData/salesDetailReport/list.vue
  21. 3 18
      src/views/reportData/salesReport/list.vue
  22. 8 6
      src/views/salesManagement/salesQuery/chooseCustomModal.vue
  23. 1 1
      src/views/salesManagement/salesQuery/detail.vue
  24. 9 8
      src/views/salesManagement/salesQuery/list.vue
  25. 11 5
      src/views/salesManagement/salesReturn/queryPart.vue
  26. 1 1
      src/views/salesManagement/salesReturn/salesReturnEdit.vue
  27. 1 1
      src/views/salesManagement/urgentItemsOffset/detail.vue

+ 2 - 2
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "1.1.7",
-    "message": "发现有新版本发布,确定更新系统?"
+  "version": "1.1.8",
+  "message": "发现有新版本发布,确定更新系统?"
 }

+ 7 - 1
src/views/Home.vue

@@ -757,6 +757,13 @@ export default {
   computed: {
     ...mapGetters(['mustChangePwd'])
   },
+  watch: {
+    hiddenBizData (newValue, oldValue) {
+      if (!newValue) {
+        this.getBizData()
+      }
+    }
+  },
   methods: {
     hasNewProduct () {
       queryNewProductPage({ pageNo: 1, pageSize: 20, onlineFalg: this.onlineFalg }).then(res => {
@@ -840,7 +847,6 @@ export default {
   activated () {
     // 请求导航指引合计
     this.getNavCount()
-    this.getBizData()
     this.getMerchantData()
   },
   beforeRouteEnter (to, from, next) {

+ 9 - 1
src/views/common/settleAccount.js

@@ -49,6 +49,8 @@ const SettleAccount = {
     settleStyleSn(a,b){
       if(a){
         this.getList()
+      }else{
+        this.clearVal()
       }
     }
   },
@@ -67,7 +69,7 @@ const SettleAccount = {
       this.defaultVal = value;
       const accountName = this.list.find(item => item[this.defValKey] == value).accountName
       this.$emit('input', value);
-      this.$emit('change', this.value, accountName);
+      this.$emit('change', value, accountName);
     },
     // 列表数据
     getList () {
@@ -80,6 +82,12 @@ const SettleAccount = {
         }
       })
     },
+    clearVal(){
+      this.list = []
+      this.defaultVal = undefined
+      this.$emit('input', undefined);
+      this.$emit('change', undefined, undefined);
+    }
   },
 };
 

+ 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 () {

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

+ 10 - 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,10 @@ export default {
     },
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      console.log(name)
+      if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     settleAccountChange (v, name) {
       this.form.settleAccountName = name

+ 14 - 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,10 @@ export default {
     ...mapActions(['GetSettleAccountState']),
     // 选择结算方式
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      console.log(name)
+      if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     //  递归函数
     recursionFun (data) {
@@ -153,6 +157,7 @@ export default {
     },
     //  详情
     getDetail () {
+      this.spinning = true
       findExpenseDetail({ id: this.$route.params.id }).then(res => {
         if (res.status == 200) {
           this.form = Object.assign({}, this.form, res.data)
@@ -160,6 +165,9 @@ export default {
         } else {
           this.$refs.ruleForm.resetFields()
         }
+        setTimeout(() => {
+          this.spinning = false
+        }, 1000)
       })
     },
     //  保存

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

+ 9 - 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,9 @@ export default {
       this.isEdit = false
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+		 if (name) {
+        this.form.settleStyleName = name.dispName
+      }
     },
     //  保存
     handleSubmit (e) {

+ 10 - 6
src/views/financialManagement/settleModal/settleModal.vue

@@ -27,12 +27,14 @@
           </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 +56,11 @@
 
 <script>
 import { commonMixin } from '@/utils/mixin'
-import settleStyle from '@/views/common/settleStyle'
 import settleAccount from '@/views/common/settleAccount'
+import { VSelect } from '@/components'
 export default {
   name: 'SettleModal',
-  components: { settleStyle, settleAccount },
+  components: { settleAccount, VSelect },
   mixins: [commonMixin],
   props: {
     openModal: { //  弹框显示状态
@@ -100,7 +102,9 @@ export default {
       }
     },
     settleStyleChange (v, name) {
-      this.form.settleStyleName = name
+      if (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="收货地址">

+ 2 - 17
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'
@@ -235,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 || '--' } },
@@ -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()

+ 3 - 18
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 },
@@ -170,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 : '--') } },
@@ -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 () {

+ 2 - 17
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'
@@ -229,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 || '--' } },
@@ -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()

+ 3 - 18
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 },
@@ -164,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 : '--') } },
@@ -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]
   },

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

+ 9 - 8
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 {
@@ -245,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 || '--' } },

+ 11 - 5
src/views/salesManagement/salesReturn/queryPart.vue

@@ -169,7 +169,6 @@ export default {
       columns: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        console.log(this.warehouseCascadeData, this.grabFlag)
         this.disabled = true
         // 抓单时
         if (this.grabFlag == 1) {
@@ -180,22 +179,28 @@ export default {
           this.queryParam.salePriceType = this.priceType
         }
         return fun[this.grabFlag](Object.assign(parameter, this.queryParam)).then(res => {
+          console.log(res)
           let data
           if (res.status == 200) {
             data = res.data
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
+              console.log(data, this.grabFlag)
               // 不抓单
               if (this.grabFlag == 0) {
+                console.log(this.warehouseCascadeData, data)
                 data.list[i].putCost = data.list[i].lastStockCost
                 const warehouse = this.warehouseCascadeData.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
-                const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
-                // const warehouse = this.warehouseCascadeData[0].warehouseLocationList[0]
-                console.log(warehouse, '仓库sn', warehouseLocation, '仓位sn')
-                data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
+                if (warehouse) {
+                  const warehouseLocation = warehouse.warehouseLocationList.find(item => item.sysFlag == 1 && item.wasteFlag == 0)
+                  if (warehouseLocation) {
+                    data.list[i].warehouseCascade = [warehouse.warehouseSn, warehouseLocation.warehouseLocationSn]
+                  }
+                }
                 data.list[i].returnQty = 1
                 data.list[i].celQty = 0
+                console.log(data)
               } else {
                 // 抓单
                 data.list[i].returnQty = data.list[i].qty - data.list[i].hasReturnQty
@@ -210,6 +215,7 @@ export default {
               }
             }
             this.listData = data.list || []
+            console.log(this.listData)
             this.disabled = false
           }
           return data

+ 1 - 1
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -16,7 +16,7 @@
         <!-- 查询配件列表 -->
         <queryPart
           ref="queryPart"
-          grabFlag="0"
+          :grabFlag="0"
           :newLoading="isInster"
           :warehouseCascadeData="warehouseCascadeData"
           @add="saveProduct"></queryPart>

+ 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.settleStyleDictValue) || '--' }}</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>