Explorar o código

Merge branch 'develop_yh11' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_12

# Conflicts:
#	public/version.json
lilei %!s(int64=2) %!d(string=hai) anos
pai
achega
d77ccc3d41

+ 1 - 1
public/version.json

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

+ 1 - 1
src/api/allocLinkageOut.js

@@ -103,7 +103,7 @@ export const getTenantList = (params) => {
   })
 }
 // 调往对象
-export const getReportTenantList = (params) => {
+export const getReportOutTenantList = (params) => {
   return axios({
     url: '/report/reportAllocLinkageOut/reportDealer',
     data: params,

+ 1 - 1
src/api/allocLinkagePut.js

@@ -1,6 +1,6 @@
 import { axios } from '@/utils/request'
 // 调往对象
-export const getReportTenantList = (params) => {
+export const getReportPutTenantList = (params) => {
   return axios({
     url: '/report/reportAllocLinkagePut/reportDealer',
     data: params,

+ 3 - 3
src/views/allocationManagement/chainTransferIn/list.vue

@@ -12,7 +12,7 @@
             </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="调出对象">
-                <outTenant id="chainTransferInList-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
+                <getTenantList id="chainTransferInList-outTenantSn" v-model="queryParam.outTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
@@ -136,11 +136,11 @@ import { STable, VSelect } from '@/components'
 import { formatDecimal } from '@/libs/tools'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { allocLinkagePutList, allocLinkagePutAudit } from '@/api/allocLinkagePut'
-import outTenant from '@/views/common/outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import stateIcon from '@/views/common/stateIcon'
 export default {
   name: 'AllocLinkagePutList',
-  components: { STable, VSelect, rangeDate, stateIcon, outTenant },
+  components: { STable, VSelect, rangeDate, stateIcon, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 3 - 3
src/views/allocationManagement/chainTransferOut/list.vue

@@ -23,7 +23,7 @@
             <template v-if="advanced">
               <a-col :md="6" :sm="24">
                 <a-form-item label="调往对象">
-                  <outTenant id="chainTransferOutList-putTenantSn" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></outTenant>
+                  <getTenantList id="chainTransferOutList-putTenantSn" type="out" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -160,11 +160,11 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import basicInfoModal from './basicInfoModal.vue'
 import stateIcon from '@/views/common/stateIcon'
 import getDate from '@/libs/getDate.js'
-import outTenant from '@/views/common/outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import { allocLinkageOutList, allocLinkageAudit, allocLinkageOutDel, allocLinkageOutStock } from '@/api/allocLinkageOut'
 export default {
   name: 'AllocLinkageOutList',
-  components: { STable, VSelect, basicInfoModal, rangeDate, stateIcon, outTenant },
+  components: { STable, VSelect, basicInfoModal, rangeDate, stateIcon, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 3 - 3
src/views/chainReportData/chainCallReport/detailList.vue

@@ -31,7 +31,7 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="调往对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
+                <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
             <a-col :md="4" :sm="24">
@@ -117,10 +117,10 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import outTenant from './outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import { reportAllocLinkageOutDetailList, reportAllocLinkageOutDetailCount, reportAllocLinkageOutDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
+  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 3 - 3
src/views/chainReportData/chainCallReport/list.vue

@@ -31,7 +31,7 @@
           <template v-if="advanced">
             <a-col :md="6" :sm="24">
               <a-form-item label="调往对象">
-                <outTenant id="chainCallReportExport-putTenantSn" v-model="queryParam.putTenantSn" placeholder="请选择调往对象"></outTenant>
+                <getTenantList id="chainCallReportExport-putTenantSn" type="out" state="FINISH" placeholder="请选择调往对象" v-model="queryParam.putTenantSn"></getTenantList>
               </a-form-item>
             </a-col>
              <a-col :md="4" :sm="24">
@@ -95,10 +95,10 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import outTenant from './outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import { reportAllocLinkageOutList, reportAllocLinkageOutCount, reportAllocLinkageOutExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, outTenant },
+  components: { STable, VSelect, rangeDate, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 3 - 3
src/views/chainReportData/chainTransferReport/detailList.vue

@@ -25,7 +25,7 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <a-form-item label="调出对象">
-              <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
+              <getTenantList id="chainTransferInReport-outTenantSn" state="FINISH" v-model="queryParam.outTenantSn"></getTenantList>
             </a-form-item>
           </a-col>
           <template v-if="advanced">
@@ -112,10 +112,10 @@ import { downloadExcel } from '@/libs/JGPrint.js'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
 import supplier from '@/views/common/supplier'
-import outTenant from './outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import { reportAllocLinkagePutDetailList, reportAllocLinkagePutDetailCount, reportAllocLinkagePutDetailExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, outTenant },
+  components: { STable, VSelect, rangeDate, ProductType, ProductBrand, supplier, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 3 - 3
src/views/chainReportData/chainTransferReport/list.vue

@@ -25,7 +25,7 @@
           </a-col>
           <a-col :md="4" :sm="24">
             <a-form-item label="调出对象">
-              <outTenant id="chainTransferInReport-outTenantSn" v-model="queryParam.outTenantSn"></outTenant>
+              <getTenantList id="chainTransferInReport-outTenantSn" state="FINISH" v-model="queryParam.outTenantSn"></getTenantList>
             </a-form-item>
           </a-col>
           <a-col :md="4" :sm="24">
@@ -84,10 +84,10 @@ import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import outTenant from './outTenant.js'
+import getTenantList from '@/views/common/getTenantList.js'
 import { reportAllocLinkagePutList, reportAllocLinkagePutCount, reportAllocLinkagePutExport } from '@/api/reportData'
 export default {
-  components: { STable, VSelect, rangeDate, outTenant },
+  components: { STable, VSelect, rangeDate, getTenantList },
   mixins: [commonMixin],
   data () {
     return {

+ 0 - 76
src/views/chainReportData/chainTransferReport/outTenant.js

@@ -1,76 +0,0 @@
-import { getReportTenantList } from '@/api/allocLinkagePut'
-// 调出对象
-const SettleStyle = {
-  template: `
-        <a-select
-          :id="id"
-          :placeholder="placeholder"
-          allowClear
-          :value="defaultVal"
-          :showSearch="true"
-          @change="handleChange"
-          :filter-option="filterOption">
-          <a-select-option v-for="item in list" :key="item[defValKey]" :value="item[defValKey]">{{ item.dealerName }}</a-select-option>
-        </a-select>
-    `,
-  props: {
-    value: {
-      type: String,
-      defatut: ''
-    },
-    id: {
-      type: String,
-      default: ''
-    },
-    defValKey: {
-      type: String,
-      default: 'dealerSn'
-    },
-    placeholder: {
-      type: String,
-      default: '请选择调出对象'
-    }
-  },
-  data() {
-    return {
-      defaultVal: this.value||undefined,
-      list: []
-    };
-  },
-  watch: {
-    value(newValue, oldValue) {
-      console.log(newValue)
-      this.defaultVal = newValue||undefined
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    filterOption (input, option) {
-      return (
-        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      )
-    },
-    handleChange(value) {
-      console.log(value)
-      this.defaultVal = value;
-      const row = this.list.find(item => item[this.defValKey] == value)
-      this.$emit('input', value);
-      this.$emit('change', this.defaultVal, row?row.dealerName:'');
-    },
-    // 列表数据
-    getList () {
-      const _this = this
-      getReportTenantList({}).then(res => {
-        if (res.status == 200) {
-          _this.list = res.data || []
-        } else {
-          _this.list = []
-        }
-      })
-    },
-  },
-};
-
-export default SettleStyle

+ 1 - 1
src/views/common/custType.js

@@ -17,7 +17,7 @@ const custType = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 15 - 5
src/views/chainReportData/chainCallReport/outTenant.js → src/views/common/getTenantList.js

@@ -1,6 +1,7 @@
-import { getReportTenantList } from '@/api/allocLinkageOut'
+import { getReportPutTenantList } from '@/api/allocLinkagePut'
+import { getReportOutTenantList } from '@/api/allocLinkageOut'
 // 调出对象
-const SettleStyle = {
+const getTenantList = {
   template: `
         <a-select
           :id="id"
@@ -16,7 +17,7 @@ const SettleStyle = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,
@@ -29,6 +30,14 @@ const SettleStyle = {
     placeholder: {
       type: String,
       default: '请选择调出对象'
+    },
+    type: {
+      type: String,
+      default: 'put'
+    },
+    state: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -62,7 +71,8 @@ const SettleStyle = {
     // 列表数据
     getList () {
       const _this = this
-      getReportTenantList({}).then(res => {
+      const fun = this.type == 'put' ? getReportPutTenantList : getReportOutTenantList
+      fun({state: this.state}).then(res => {
         if (res.status == 200) {
           _this.list = res.data || []
         } else {
@@ -73,4 +83,4 @@ const SettleStyle = {
   },
 };
 
-export default SettleStyle
+export default getTenantList

+ 1 - 1
src/views/common/outTenant.js

@@ -16,7 +16,7 @@ const SettleStyle = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/productBrand.js

@@ -17,7 +17,7 @@ const ProductBrand = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/productType.js

@@ -16,7 +16,7 @@ const ProductType = {
   props: {
     value: {
       type: Array,
-      defatut: function () {
+      default: function () {
         return []
       }
     },

+ 1 - 1
src/views/common/returnReason.js

@@ -25,7 +25,7 @@ const ReturnReason = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

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

@@ -16,7 +16,7 @@ const SettleAccount = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/settleStyle.js

@@ -16,7 +16,7 @@ const SettleStyle = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/shelfList.js

@@ -20,7 +20,7 @@ const shelfSList = {
   props: {
     value: {
       type: [String, Array],
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/supplier.js

@@ -18,7 +18,7 @@ const Employee = {
   props: {
     value: {
       type: String,
-      defatut: ''
+      default: ''
     },
     id: {
       type: String,

+ 1 - 1
src/views/common/warehouse.js

@@ -16,7 +16,7 @@ const Warehouse = {
   props: {
     value: {
       type: Array,
-      defatut: function () {
+      default: function () {
         return []
       }
     },