Explorar o código

Merge branch 'develop_yh29' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh29

chenrui hai 1 ano
pai
achega
b2f956019c
Modificáronse 3 ficheiros con 92 adicións e 2 borrados
  1. 7 0
      src/api/expenseManagement.js
  2. 83 0
      src/views/common/otherTransactions.js
  3. 2 2
      vue.config.js

+ 7 - 0
src/api/expenseManagement.js

@@ -16,6 +16,13 @@ export const employeeQueryList = (params) => {
     method: 'post'
   })
 }
+// 其它往来人员
+export const otherOrgQuery = (params) => {
+  return axios({
+    url: `/otherorg/queryAll`,
+    method: 'get'
+  })
+}
 
 // 费用报销单列表
 export const expenseAccountList = (params) => {

+ 83 - 0
src/views/common/otherTransactions.js

@@ -0,0 +1,83 @@
+import { otherOrgQuery } from '@/api/expenseManagement.js'
+const Employee = {
+  template: `
+      <a-select
+        :placeholder="placeholder"
+        :id="id"
+        allowClear
+        :value="defaultVal"
+        :showSearch="true"
+        :disabled="disabledFlag"
+        @change="handleChange"
+        option-filter-prop="children"
+        :filter-option="filterOption">
+        <a-select-option v-for="item in list" :key="item.otherOrgSn" :value="item.otherOrgSn">
+        {{ item.otherOrgName }}
+        </a-select-option>
+      </a-select>
+    `,
+  props: {
+    value: {
+      type: String,
+      defatut: ''
+    },
+    id: {
+      type: String,
+      default: ''
+    },
+    placeholder: {
+      type: String,
+      default: '请选择其它往来机构'
+    },
+    enableFlag: {
+      type: String,
+      default: ''
+    },
+    disabledFlag: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      defaultVal: this.value,
+      list: []
+    }
+  },
+  mounted () {
+    this.getList()
+  },
+  watch: {
+    value (newValue, oldValue) {
+      this.defaultVal = newValue
+    }
+  },
+  methods: {
+    filterOption (input, option) {
+      return (
+        option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      )
+    },
+    handleChange (value) {
+      this.defaultVal = value
+      const item = this.list.find(item => item.supplierSn == value)
+      this.$emit('input', value)
+      this.$emit('change', value, item)
+    },
+    getList () {
+      otherOrgQuery().then(res => {
+        if (res.status == 200) {
+          if (this.enableFlag != '') {
+            this.list = res.data.filter(item => item.enableFlag == this.enableFlag)
+          } else {
+            this.list = res.data
+          }
+        } else {
+          this.list = []
+        }
+      })
+    }
+  }
+}
+
+export default Employee

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.103:8602/ocs-admin',
+        target: 'http://192.168.2.103:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {