lilei 1 ano atrás
pai
commit
fe9bd38983

+ 22 - 11
src/views/expenseManagement/expenseReimbursement/baseDataModal.vue

@@ -125,6 +125,7 @@ export default {
         labelCol: { span: 6 },
         wrapperCol: { span: 14 }
       },
+      fromPage: null,
       attachList: [],
       attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo',
       expenseTypes: [],
@@ -214,23 +215,28 @@ export default {
         item.fileType = item.extName
       })
     },
+    // 设置数据
+    setDetail(data, from){
+      console.log(data)
+      this.fromPage = from
+      this.form = Object.assign(this.form, data)
+      // 获取附件列表
+      if(this.$refs.attachList){
+        this.form.expenseAccountFilesList = ''
+        this.attachList = data.expenseAccountFilesList
+        this.$refs.attachList.setFileList(this.attachList)
+      }
+      setTimeout(()=>{
+        this.expenseTypes = data.expenseType ? [this.form.expenseType, this.form.expenseType2] : []
+      }, 500)
+    },
     //  详情
     getDetail () {
       this.spinning = true
       this.disabled = true
       expenseAccountDetail({ expenseAccountSn: this.expenseAccountSn }).then(res => {
         if (res.status == 200) {
-          const data = res.data
-          this.form = Object.assign(this.form, data)
-          // 获取附件列表
-          this.form.expenseAccountFilesList = ''
-          this.attachList = res.data.expenseAccountFilesList
-          this.$refs.attachList.setFileList(this.attachList)
-          if (this.form.expenseType) {
-            this.expenseTypes = [this.form.expenseType, this.form.expenseType2]
-          } else {
-            this.expenseTypes = []
-          }
+          this.setDetail(res.data)
         } else {
           this.$refs.ruleForm.resetFields()
         }
@@ -249,6 +255,11 @@ export default {
           form.expenseAccountFilesList = this.attachList
           _this.spinning = true
           console.log(form)
+          // 从销售单转的费用
+          if(_this.fromPage=='sales'){
+            _this.$emit('expenseSaveOk',form)
+            return false
+          }
           expenseAccountSave(form).then(res => {
             if (res.status == 200) {
               _this.$message.success(res.message)

+ 14 - 1
src/views/salesManagement/salesQueryNew/list.vue

@@ -273,6 +273,8 @@
         </div>
       </div>
     </commonModal>
+    <!-- 新增费用单 -->
+    <baseDataModal ref="expenseModal" @expenseSaveOk="expenseSaveOk" :show="openBaseModal" @close="openBaseModal=false"></baseDataModal>
     <!-- 导出提示框 -->
     <reportModal :visible="showExport" @close="showExport=false"></reportModal>
   </a-card>
@@ -290,6 +292,7 @@ import { STable, VSelect } from '@/components'
 import commonModal from '@/views/common/commonModal.vue'
 import chooseCustomModal from './chooseCustomModal.vue'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
+import baseDataModal from '@/views/expenseManagement/expenseReimbursement/baseDataModal.vue'
 import reportModal from '@/views/common/reportModal.vue'
 import { salesList, salesDel,salesCancle, salesCount, queryCreateBySalesBillSn, expenseAccountSave } from '@/api/salesNew'
 import { hdExportExcel } from '@/libs/exportExcel'
@@ -299,13 +302,14 @@ import { salesDetailExport } from '@/api/salesBillReport'
 export default {
   name: 'SalesQueryList',
   mixins: [commonMixin],
-  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse },
+  components: { STable, VSelect, chooseCustomModal, dealerSubareaScopeList, Area, rangeDate, subarea, commonModal, reportModal, chooseWarehouse, baseDataModal },
   data () {
     return {
       spinning: false,
       advanced: true, // 高级搜索 展开/关闭
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 选择客户弹框是否显示
+      openBaseModal: false, // 费用弹框
       showTipModal: false, // 备货打印弹框
       showExport: false,
       exportLoading: false,
@@ -529,6 +533,7 @@ export default {
               _this.expenseSave(hasExpense,_this.expenseOption)
             }else{
               _this.$message.info("请选择费用报销单类型!")
+              return true
             }
           },
           onCancel() {
@@ -544,10 +549,18 @@ export default {
     expenseSave(data, type){
       console.log(data,type)
       const params = type ? data[type] : data.balance||data.exceed
+      if(params){
+        this.openBaseModal = true
+        this.$refs.expenseModal.setDetail(params, 'sales')
+      }
+    },
+    expenseSaveOk(params){
       expenseAccountSave(params).then(res => {
         if(res.status == 200){
           this.$message.info(res.message)
           this.$refs.table.refresh()
+          this.openBaseModal = false
+          this.$router.push({ name: 'expenseReimbursementEdit', params: { sn: res.data.expenseAccountSn } })
         }
       })
     },

+ 3 - 1
src/views/salesManagement/waitDispatchNew/queryPart.vue

@@ -402,8 +402,10 @@ export default {
         const params = this.queryParam
         if(params.promoFlag){
           params.isGifg = params.promoFlag == 1 ? 'Y' : 'N'
+        }else{
+          params.isGifg = undefined
         }
-        
+ 
         const active = this.activeList
 
         // 正常产品

+ 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.113:8660/ocs-admin',
+        // target: 'http://192.168.2.113:8660/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: {