Преглед изворни кода

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

chenrui пре 2 година
родитељ
комит
0758153b35

BIN
public/templ/费用明细模板.xlsx


+ 46 - 11
src/views/common/subarea.js

@@ -45,6 +45,10 @@ const AreaList = {
     changeOnSelect:{
         type: Boolean,
         default: true
+    },
+    showLeve:{
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -73,17 +77,48 @@ const AreaList = {
     getArea () {
       subareaQueryAll().then(res => {
             if (res.status == 200) {
-                res.data&&res.data.map(item => {
-                  item.name = item.subareaName
-                  item.areaSn = item.subareaSn
-                  if(item.subareaAreaList){
-                    item.subareaAreaList.map(cd => {
-                      cd.name = cd.subareaAreaName
-                      cd.areaSn = cd.subareaAreaSn
-                    })
-                  }
-                })
-                this.list = res.data
+                // 显示一级二级
+                if(this.showLeve == ''){
+                  res.data&&res.data.map(item => {
+                    item.name = item.subareaName
+                    item.areaSn = item.subareaSn
+                    if(item.subareaAreaList){
+                      item.subareaAreaList.map(cd => {
+                        cd.name = cd.subareaAreaName
+                        cd.areaSn = cd.subareaAreaSn
+                      })
+                    }
+                  })
+                  this.list = res.data
+                }
+                
+                // 只显示一级
+                if(this.showLeve == 1){
+                  const ret = []
+                  res.data&&res.data.map(item => {
+                    item.name = item.subareaName
+                    item.areaSn = item.subareaSn
+                    delete item.subareaAreaList
+                    ret.push(item)
+                  })
+                  this.list = ret
+                }
+
+                // 只显示二级
+                if(this.showLeve == 2){
+                  const ret = []
+                  res.data&&res.data.map(item => {
+                    if(item.subareaAreaList){
+                      item.subareaAreaList.map(cd => {
+                        cd.name = cd.subareaAreaName
+                        cd.areaSn = cd.subareaAreaSn
+                        ret.push(cd)
+                      })
+                    }
+                  })
+                  this.list = ret
+                }
+                
             }
         })
     },

+ 1 - 0
src/views/expenseManagement/expenseReimbursement/epenseDetailModal.vue

@@ -53,6 +53,7 @@
                     id="epenseDetailModal-subarea"
                     ref="subareaBox"
                     defValKey="name"
+                    :changeOnSelect="false"
                     @change="subareaChange"
                     v-model="subareaList"
                     placeholder="请选择所属区域"

+ 5 - 16
src/views/expenseManagement/expenseReimbursement/importGuideModal.vue

@@ -17,8 +17,10 @@
           <ul>
             <li>1) 导入的Excel文件中必须包含名为“记账类型”、“记账名称”、“费用承担方类型”、“费用承担方”、“费用承担金额”的列,且名称必须相同</li>
             <li>2) 其他列可根据实际情况填写,如果符合规则,系统会一起导入</li>
+            <li><a :href="filePath" style="margin: 5px 0 0 15px;display: block;">
+            <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+          </a></li>
           </ul>
-          <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button>
         </div>
         <div class="explain-item">
           <div class="explain-tit">
@@ -87,7 +89,8 @@ export default {
       uploadParams: {
         savePathType: 'local'
       },
-      exportLoading: false
+      exportLoading: false,
+      filePath: location.protocol + '//' +location.host + '/templ/费用明细模板.xlsx'
     }
   },
   methods: {
@@ -125,20 +128,6 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
-    // 下载模板
-    handleExport () {
-      this.exportLoading = true
-      setTimeout(() => {
-        this.exportLoading = false
-      }, 1000)
-      const link = document.createElement('a')
-      link.style.display = 'none'
-      link.href = 'https://jg-ocs.oss-cn-beijing.aliyuncs.com/templ/promo/expenseAccountDetailImport.xlsx?t=' + new Date().getTime()
-      link.setAttribute('download', '费用明细模板' + '.xlsx')
-      document.body.appendChild(link)
-      link.click()
-      document.body.removeChild(link)
     }
   },
   watch: {

+ 10 - 12
src/views/expenseManagement/expenseReimbursementDetail/list.vue

@@ -75,7 +75,12 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-item label="所属区域">
-                  <subarea id="expenseReimbursementDetailList-subarea" ref="subarea" @change="subareaChange"></subarea>
+                  <a-input id="expenseReimbursementDetailList-subarea" v-model.trim="queryParam.subareaArea.subareaName" allowClear placeholder="请输入所属区域"/>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="所属分区">
+                  <a-input id="expenseReimbursementDetailList-subareaArea" v-model.trim="queryParam.subareaArea.subareaAreaName" allowClear placeholder="请输入所属分区"/>
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
@@ -229,8 +234,8 @@ export default {
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
         subareaArea:{
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaName: '',
+          subareaAreaName: ''
         },
         provinceName: '',
         cityName: '',
@@ -349,10 +354,6 @@ export default {
         _this.spinning = false
       })
     },
-    subareaChange(val){
-      this.queryParam.subareaArea.subareaSn = val[0] ? val[0] : undefined
-      this.queryParam.subareaArea.subareaAreaSn = val[1] ? val[1] : undefined
-    },
     // 重置
     resetSearchForm () {
       this.$refs.rangeDate.resetDate(this.time)
@@ -373,8 +374,8 @@ export default {
         splitObjSn: undefined, //  费用承担方
         childSplitObjSn: undefined, // 费用承担人
         subareaArea:{
-          subareaSn: undefined,
-          subareaAreaSn: undefined
+          subareaName: '',
+          subareaAreaName: ''
         },
         provinceName: '',
         cityName: '',
@@ -382,9 +383,6 @@ export default {
         citySn: undefined
       }
       this.expenseTypes = []
-      if(this.advanced){
-        this.$refs.subarea.clearData()
-      }
       this.$refs.table.refresh(true)
     },
     pageInit () {

+ 2 - 0
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -101,6 +101,8 @@ export default {
         this.$refs.ruleForm.clearValidate()
         this.getDefaultAddress()
       } else {
+        this.form.buyerName = ''
+        this.form.buyerSn = undefined
         this.verifyFun(this.addressId)
       }
     },

+ 2 - 2
vue.config.js

@@ -107,9 +107,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.113:8660/ocs-admin',
+        target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {