Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/ProductMag/index.vue

@@ -22,7 +22,16 @@
         <to_examine v-if="tool.checkAuth($route.name,'toExamine')" class="inline-16" style="margin-left: 10px" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></to_examine>
         <counter_examine v-if="tool.checkAuth($route.name,'reverseReview')" class="inline-16" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></counter_examine>
         <priceLevelSetting class="inline-16" v-if="tool.checkAuth($route.name,'priceSet')" ></priceLevelSetting>
-        <el-button size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
+        <el-button class="inline-16" size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
+        <importFile 
+          v-if="tool.checkAuth($route.name,'export')"
+          ref="importFile" 
+          class="inline-16" 
+          :bindData="{ownertable:'plm_item',ownerid:$route.query.id,usetype:'default'}" 
+          :errorUrl="errorUrl" 
+          @clearUrl="errorUrl = null" 
+          @onSuccess="bindImportOrder"
+        ></importFile>
       </template>
       <template #custom>
         <div class="mt-10">
@@ -117,6 +126,7 @@ import editTemp from './modules/edit.vue'
 import to_examine from './modules/toExamine'
 import counter_examine from './modules/counterExamine'
 import priceLevelSetting from './modules/priceLevelSetting'
+import importFile from './modules/importFile.vue'
 import { Loading } from 'element-ui';
 
 export default {
@@ -147,7 +157,8 @@ export default {
         isonsale:'',
         status:''
       },
-      rowData:[]
+      rowData:[],
+      errorUrl:null
     }
   },
   components:{
@@ -155,7 +166,8 @@ export default {
     editTemp,
     to_examine,
     counter_examine,
-    priceLevelSetting
+    priceLevelSetting,
+    importFile
   },
   methods:{
     async isOnSaleChange(val){
@@ -190,6 +202,20 @@ export default {
       })
 
     },
+    async bindImportOrder (id) {
+      const res = await this.$api.requested({
+        "id": 20230311111404,
+        "content": {
+        "attachmentid":id
+        }
+      })
+      if (res.data !== '成功') {
+        this.errorUrl = res.data
+      }
+      this.tool.showMessage(res,() => {
+        this.$refs.basicLayout.listData()
+      })
+    },
     selectChange(){
       this.$refs.basicLayout.param.content.where = this.selectParam
       this.$refs.basicLayout.listData()

src/HDrpManagement/ProductMag/modules/importFile.vue

@@ -0,0 +1,216 @@
+<template>
+  <div>
+    <!-- 按钮类型 -->
+    <el-button type="success" size="small" @click="onShow(0)" icon="el-icon-upload">导 入</el-button>
+    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
+      <div slot="title"></div>
+      <div style="background:#f1f2f3" class="my-tabs" >
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+          <!-- <el-tab-pane label="导入经销商线索" name="first"></el-tab-pane> -->
+          <el-tab-pane label="导入" name="second"></el-tab-pane>
+        </el-tabs>
+      </div>
+      <div style="padding:20px">
+        <el-upload
+          style="width:100%"
+          ref="my-upload"
+          class="upload-demo normal-margin"
+          :accept="accept"
+          action="#"
+          :auto-upload="false"
+          :show-file-list="false"
+          :on-change="handleChange"
+          drag
+          multiple>
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        </el-upload>
+        <div class="progress_panel" v-for="file in filelist" :key="file.uid">
+          <img v-if="file.type === 'DOC' || file.type === 'DOCX'" width="30" src="@/assets/file_icons/word.png"
+            alt="">
+          <img v-else-if="file.type === 'PDF'" width="30" src="@/assets/file_icons/PDF.png" alt="">
+          <img v-else-if="file.type === 'MP4' || file.type === 'AVI'" width="30" src="@/assets/file_icons/video.png"
+            alt="">
+          <img v-else-if="file.type === 'XLS' || file.type === 'XLSX'" width="30" src="@/assets/file_icons/excel.png"
+            alt="">
+          <img v-else-if="file.type === 'PNG' || file.type === 'JPG'|| file.type === 'JPEG'" width="30"
+            src="@/assets/file_icons/image.png" alt="">
+          <img v-else-if="file.type === 'PPT' || file.type === 'PPTX'" width="30" src="@/assets/file_icons/PPT.png"
+            alt="">
+          <img v-else width="30" src="@/assets/file_icons/unknow.png" alt="">
+          <div>
+            <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>上传成功</p>
+            <p>{{file.raw?file.raw.name:'暂无上传文件'}}</p>
+            <el-progress :percentage="file.progress" :show-text="false"></el-progress>
+          </div>
+        </div>
+        <slot name="errorFile"></slot>
+        <p class="tips">• 为保证数据导入顺利，推荐您下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
+        <p class="tips">• 文件中数据不能超过5000行</p>
+        <a :href="errorUrl" class="tips" style="color:red" v-if="errorUrl">•下载错误数据</a>
+        <div class="dialog-footer">
+          <el-button size="small" @click="cancel" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="warning" @click="dialogUploadVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        </div>
+      </div>
+      
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  /*
+    folderid:文件夹id; 必填
+    btntype:展示上传按钮的类型;
+    accept:限制上传文件类型;
+    bindData:附件上传成功后对应需要绑定的数据信息
+  */
+  props:['btntype','accept','bindData','errorUrl'],
+  data () {
+    return {
+      dialogUploadVisible: false,
+      params: {
+        "classname": "system.attachment.huawei.OBS",
+        "method": "getFileName",
+        "content": {
+          "filename": '',
+          "filetype": '',
+          "parentid": ""//归属文件夹ID
+        }
+      },
+      file: {},
+      filelist: [],
+      CampaignList:[],
+      activeName:'last',
+      modelurl:'',
+      campaignid:'',
+      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+    }
+  },
+  mounted () {
+   
+    // this.listData()
+  },
+  methods: {
+    onShow () {
+      this.dialogUploadVisible = true
+       this.getModelUrl()
+    },
+    cancel () {
+      this.dialogUploadVisible = false
+      this.campaignid = ''
+      this.$refs['my-upload'].clearFiles()
+      this.filelist = []
+    },
+    handleChange (file, filelist) {
+      this.filelist = filelist
+      var index = file.raw.name.lastIndexOf(".");
+      var ext = file.name.substr(index + 1);
+      this.params.content.filename = file.raw.name
+      this.params.content.filetype = ext
+      this.getUploadUrl(file, ext)
+    },
+    handleClick () {
+      this.getModelUrl()
+    },
+    // 获取导入模板
+    async getModelUrl () {
+      const res = await this.$api.requested({
+       "id":20230311102404,
+        "content": {
+        }
+      })
+      this.modelurl = res.data
+      
+    },
+    // 获取华为云上传地址
+    async getUploadUrl (file, ext) {
+      this.params.content.parentid = this.folderid
+      const res = await this.$api.requested(this.params)
+      let url = res.data.uploadurl
+      let obsfilename = res.data.serialfilename
+
+      this.upoladFileToServer(url, file, ext, obsfilename)
+    },
+    // 上传到华为云
+    async upoladFileToServer (url, file, ext, obsfilename) {      
+      let THIS = this
+      let config = {
+        headers: ext === 'pdf' ? { 'Content-Type': 'application/pdf' } : { 'Content-Type': 'application/octet-stream' },
+        onUploadProgress: function (progressEvent) {
+          let percent = progressEvent.loaded / progressEvent.total * 100
+          THIS.filelist.forEach(e => {
+            if (e.uid === file.uid) {
+              THIS.$set(e, 'type', ext.toUpperCase());
+              THIS.$set(e, 'progress', percent);
+            }
+          })
+        },
+      }
+      const res = await this.$upload.hw_upload(url, file.raw, config)
+      this.createFileRecord(obsfilename)
+    },
+
+    // 上传成功以后生成附件记录
+    async createFileRecord (obsfilename) {
+      let obj = {
+         "serialfilename": obsfilename
+      }
+      obj = Object.assign({},obj,this.bindData)
+      let param = {
+        "classname": "system.attachment.huawei.OBS",
+        "method": "uploadSuccess",
+        "content":obj
+      }
+      
+      const res = await this.$api.requested(param)
+      this.$emit('onSuccess',res.data.attachmentids[0])
+    },
+
+    clearFiles () {
+      this.$refs['my-upload'].clearFiles()
+      this.filelist = []
+      this.dialogUploadVisible = false
+      this.$emit('clearUrl')
+    },
+  }
+}
+
+</script>
+<style>
+.import-panel .el-dialog__header,.import-panel .el-dialog__body{
+  padding: 0 !important;
+}
+.upload-demo > div {
+  width: 100% !important;
+}
+.upload-demo .el-upload-dragger {
+  width: 100% !important;
+}
+</style>
+<style scoped>
+.progress_panel {
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  margin: 10px 0;
+  border-radius: 5px;
+  transition: linear 0.2s all;
+}
+.progress_panel:hover {
+  box-shadow: 0px 0px 5px #ccc;
+}
+.progress_panel > div {
+  flex: 1;
+  padding: 0 10px;
+}
+.progress_panel > div > p {
+  line-height: 30px;
+}
+.tips{
+  line-height: 30px;
+}
+</style>
+

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -205,7 +205,7 @@ export default {
       });
     },
     submitInvoice () {
-      this.$confirm(this.mainData.status === '新建'?'确定提交吗?':'确定反撤回吗?', '提示', {
+      this.$confirm(this.mainData.status === '新建'?'确定提交吗?':'确定撤回吗?', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -25,8 +25,10 @@
               <el-option
                 v-for="item in options"
                 :key="item.value"
-                :label="item.value"
+                :label="item.value + '-' + item.remarks"
                 :value="item.value">
+                <span style="float: left">{{ item.value }}</span>
+                <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
               </el-option>
             </el-select>
             <div style="text-align: right; margin: 0">
@@ -85,6 +87,11 @@ export default {
       value:''
     }
   },
+  provide () {
+    return {
+      thisDetail:() => this
+    }
+  },
   components:{
     toolList,
     confirmDate,

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -48,6 +48,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -134,6 +143,7 @@
           title="选择财务信息"
           trigger="click"
           v-model="visible2">
+          <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData()"/>
           <el-table
             :data="financiallist"
             style="width: 100%"
@@ -210,12 +220,17 @@
 <script>
 import previewImage from '@/components/previewImage/index.vue'
 import toolList from '../detail/tabs/toolList.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
-    toolList
+    toolList,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       visible:false,
@@ -241,7 +256,20 @@ export default {
       },
       agnetInfo:{},
       total:0,
-      setcol:24
+      setcol:24,
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
     }
   },
   methods:{
@@ -270,21 +298,12 @@ export default {
       this.queryFinancial()
     },
     // 收货信息:合作企业联系人
-    async receiveAddress () {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-        "sys_enterpriseid":this.agnetInfo.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":0
-          }
-        }
-      })
+    async receiveAddress (fn) {
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
     },
-
     // 账号信息
     async queryAccount () {
       const res = await this.$api.requested({

src/HManagement/marketing2/agent/importFile.vue

@@ -0,0 +1,218 @@
+<template>
+  <div>
+    <!-- 按钮类型 -->
+    <el-button type="success" size="small" @click="onShow(0)" icon="el-icon-upload">导 入</el-button>
+    <el-dialog title="文件上传" class="import-panel" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :show-close="false" @close="clearFiles">
+      <div slot="title"></div>
+      <div style="background:#f1f2f3" class="my-tabs" >
+        <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+          <!-- <el-tab-pane label="导入经销商线索" name="first"></el-tab-pane> -->
+          <el-tab-pane label="导入" name="second"></el-tab-pane>
+        </el-tabs>
+      </div>
+      <div style="padding:20px">
+        <el-upload
+          style="width:100%"
+          ref="my-upload"
+          class="upload-demo normal-margin"
+          :accept="accept"
+          action="#"
+          :auto-upload="false"
+          :show-file-list="false"
+          :on-change="handleChange"
+          drag
+          multiple>
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        </el-upload>
+        <div class="progress_panel" v-for="file in filelist" :key="file.uid">
+          <img v-if="file.type === 'DOC' || file.type === 'DOCX'" width="30" src="@/assets/file_icons/word.png"
+            alt="">
+          <img v-else-if="file.type === 'PDF'" width="30" src="@/assets/file_icons/PDF.png" alt="">
+          <img v-else-if="file.type === 'MP4' || file.type === 'AVI'" width="30" src="@/assets/file_icons/video.png"
+            alt="">
+          <img v-else-if="file.type === 'XLS' || file.type === 'XLSX'" width="30" src="@/assets/file_icons/excel.png"
+            alt="">
+          <img v-else-if="file.type === 'PNG' || file.type === 'JPG'|| file.type === 'JPEG'" width="30"
+            src="@/assets/file_icons/image.png" alt="">
+          <img v-else-if="file.type === 'PPT' || file.type === 'PPTX'" width="30" src="@/assets/file_icons/PPT.png"
+            alt="">
+          <img v-else width="30" src="@/assets/file_icons/unknow.png" alt="">
+          <div>
+            <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>上传成功</p>
+            <p>{{file.raw?file.raw.name:'暂无上传文件'}}</p>
+            <el-progress :percentage="file.progress" :show-text="false"></el-progress>
+          </div>
+        </div>
+        <slot name="errorFile"></slot>
+        <p class="tips">• 为保证数据导入顺利，推荐您下载并使用<a :href="modelurl">《Excel标准模板》</a></p>
+        <p class="tips">• 文件中数据不能超过5000行</p>
+        <a :href="errorUrl" class="tips" style="color:red" v-if="errorUrl">•下载错误数据</a>
+        <div class="dialog-footer">
+          <el-button size="small" @click="cancel" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="warning" @click="dialogUploadVisible = false" class="normal-btn-width btn-warning">确 定</el-button>
+        </div>
+      </div>
+      
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+
+export default {
+  /*
+    folderid:文件夹id; 必填
+    btntype:展示上传按钮的类型;
+    accept:限制上传文件类型;
+    bindData:附件上传成功后对应需要绑定的数据信息
+  */
+  props:['btntype','accept','bindData','errorUrl'],
+  data () {
+    return {
+      dialogUploadVisible: false,
+      params: {
+        "classname": "system.attachment.huawei.OBS",
+        "method": "getFileName",
+        "content": {
+          "filename": '',
+          "filetype": '',
+          "parentid": ""//归属文件夹ID
+        }
+      },
+      file: {},
+      filelist: [],
+      CampaignList:[],
+      activeName:'last',
+      modelurl:'',
+      campaignid:'',
+      folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
+    }
+  },
+  mounted () {
+   
+    // this.listData()
+  },
+  methods: {
+    onShow () {
+      this.dialogUploadVisible = true
+       this.getModelUrl()
+    },
+    cancel () {
+      this.dialogUploadVisible = false
+      this.campaignid = ''
+      this.$refs['my-upload'].clearFiles()
+      this.filelist = []
+    },
+    handleChange (file, filelist) {
+      this.$refs['my-upload'].clearFiles()
+      
+      this.filelist = filelist
+      var index = file.raw.name.lastIndexOf(".");
+      var ext = file.name.substr(index + 1);
+      this.params.content.filename = file.raw.name
+      this.params.content.filetype = ext
+      this.getUploadUrl(file, ext)
+    },
+    handleClick () {
+      this.getModelUrl()
+    },
+    // 获取导入模板
+    async getModelUrl () {
+      const res = await this.$api.requested({
+       "id":20230311162904,
+        "content": {
+        }
+      })
+      this.modelurl = res.data
+      
+    },
+    // 获取华为云上传地址
+    async getUploadUrl (file, ext) {
+      this.params.content.parentid = this.folderid
+      const res = await this.$api.requested(this.params)
+      let url = res.data.uploadurl
+      let obsfilename = res.data.serialfilename
+
+      this.upoladFileToServer(url, file, ext, obsfilename)
+    },
+    // 上传到华为云
+    async upoladFileToServer (url, file, ext, obsfilename) {      
+      let THIS = this
+      let config = {
+        headers: ext === 'pdf' ? { 'Content-Type': 'application/pdf' } : { 'Content-Type': 'application/octet-stream' },
+        onUploadProgress: function (progressEvent) {
+          let percent = progressEvent.loaded / progressEvent.total * 100
+          THIS.filelist.forEach(e => {
+            if (e.uid === file.uid) {
+              THIS.$set(e, 'type', ext.toUpperCase());
+              THIS.$set(e, 'progress', percent);
+            }
+          })
+        },
+      }
+      const res = await this.$upload.hw_upload(url, file.raw, config)
+      this.createFileRecord(obsfilename)
+    },
+
+    // 上传成功以后生成附件记录
+    async createFileRecord (obsfilename) {
+      let obj = {
+         "serialfilename": obsfilename
+      }
+      obj = Object.assign({},obj,this.bindData)
+      let param = {
+        "classname": "system.attachment.huawei.OBS",
+        "method": "uploadSuccess",
+        "content":obj
+      }
+      
+      const res = await this.$api.requested(param)
+      this.$emit('onSuccess',res.data.attachmentids[0])
+    },
+
+    clearFiles () {
+      this.$refs['my-upload'].clearFiles()
+      this.filelist = []
+      this.dialogUploadVisible = false
+      this.$emit('clearUrl')
+    },
+  }
+}
+
+</script>
+<style>
+.import-panel .el-dialog__header,.import-panel .el-dialog__body{
+  padding: 0 !important;
+}
+.upload-demo > div {
+  width: 100% !important;
+}
+.upload-demo .el-upload-dragger {
+  width: 100% !important;
+}
+</style>
+<style scoped>
+.progress_panel {
+  display: flex;
+  align-items: center;
+  padding: 10px;
+  margin: 10px 0;
+  border-radius: 5px;
+  transition: linear 0.2s all;
+}
+.progress_panel:hover {
+  box-shadow: 0px 0px 5px #ccc;
+}
+.progress_panel > div {
+  flex: 1;
+  padding: 0 10px;
+}
+.progress_panel > div > p {
+  line-height: 30px;
+}
+.tips{
+  line-height: 30px;
+}
+</style>
+

src/HManagement/marketing2/agent/index.vue

@@ -14,6 +14,16 @@
         :autoQuery="false"
         :options="options"
         @listCreate="list">
+        <div slot="titleRight">
+          <importFile 
+            ref="importFile" 
+            class="inline-16" 
+            :bindData="{ownertable:'sa_agents',ownerid:$route.query.id,usetype:'default'}" 
+            :errorUrl="errorUrl" 
+            @clearUrl="errorUrl = null" 
+            @onSuccess="bindImportOrder"
+          ></importFile>
+        </div>
         <div slot="custom">
           <div class="label_center">
             <span class="search_label">状态: </span>
@@ -59,6 +69,7 @@ import addArea from './area/modules/add_area'
 import editArea from './area/modules/edit_area'
 import startArea from './area/modules/start_area'
 import delArea from './area/modules/del_area'
+import importFile from './importFile.vue'
 import { log } from '@antv/g2plot/lib/utils'
 
 export default {
@@ -68,13 +79,15 @@ export default {
     editArea,
     delArea,
     startArea,
+    importFile
   },
   data () {
     return {
       options:[],
       areaInfo:{},
       status:'',
-      statusList:[]
+      statusList:[],
+      errorUrl:null
     }
   },
   provide () {
@@ -100,6 +113,20 @@ export default {
       const res = await this.$api.requested(param);
       this.statusList = res.data;
     },
+    async bindImportOrder (id) {
+      const res = await this.$api.requested({
+        "id": 20230311163004,
+        "content": {
+        "attachmentid":id
+        }
+      })
+      if (res.data !== '成功') {
+        this.errorUrl = res.data
+      }
+      this.tool.showMessage(res,() => {
+        this.$refs.basicLayout.listData()
+      })
+    },
     handleSelectChange() {
       this.$refs['basicLayout'].param.content.where.status = this.status
        this.$refs['basicLayout'].param.content.pageNumber = 1

src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -46,6 +46,11 @@ export default {
     toolList,
     confirmDate
   },
+  provide () {
+    return {
+      thisDetail:()=> this 
+    }
+  },
   methods:{
     async orderreviewtype () {
       const res = await this.$store.dispatch('optiontypeselect','orderreviewtype')

src/SDrpManagement/salerToolBorrowing/modules/edit.vue

@@ -48,6 +48,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -134,6 +143,7 @@
           title="选择财务信息"
           trigger="click"
           v-model="visible2">
+          <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData()"/>
           <el-table
             :data="financiallist"
             style="width: 100%"
@@ -209,11 +219,15 @@
 <script>
 import previewImage from '@/components/previewImage/index.vue'
 import toolList from '../detail/tabs/toolList.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
-    toolList
+    toolList,
+    addAmountInfo,
+    addAddressInfo
   },
   data () {
     return {
@@ -240,9 +254,23 @@ export default {
       },
       agnetInfo:{},
       total:0,
-      setcol:24
+      setcol:24,
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
     }
   },
+  inject:['thisDetail'],
   methods:{
     onShow () {
       this.queryAgentiInfo()
@@ -269,21 +297,12 @@ export default {
       this.queryFinancial()
     },
     // 收货信息:合作企业联系人
-    async receiveAddress () {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-        "sys_enterpriseid":this.agnetInfo.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":0
-          }
-        }
-      })
+    async receiveAddress (fn) {
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
     },
-
     // 账号信息
     async queryAccount () {
       const res = await this.$api.requested({

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -97,6 +97,10 @@ export default {
           label:'开户行及账号',
           value:this.mainData.bank + this.mainData.bankcardno
         },
+        {
+          label:'开票金额',
+          value:this.tool.formatAmount(this.mainData.suminvoiceamount,2)
+        },
         {
           label:'发票限额',
           value:this.mainData.quota

src/SDrpManagement/toolBorrowing/detail/index.vue

@@ -47,6 +47,11 @@ export default {
     toolList,
     confirmDate
   },
+  provide () {
+    return {
+      thisDetail:()=> this 
+    }
+  },
   methods:{
     async orderreviewtype () {
       const res = await this.$store.dispatch('optiontypeselect','orderreviewtype')

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -57,6 +57,15 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                <el-input 
+                  size="small"  
+                  v-model="addressparam.content.where.condition" 
+                  placeholder="请输入搜索内容" 
+                  style="width:150px"
+                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+              </div>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -143,6 +152,7 @@
           title="选择财务信息"
           trigger="click"
           v-model="visible2">
+          <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData()"/>
           <el-table
             :data="financiallist"
             style="width: 100%"
@@ -222,13 +232,18 @@
 <script>
 import previewImage from '@/components/previewImage/index.vue'
 import toolList from '../detail/tabs/toolList.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 
 export default {
   props:['data'],
   components:{
     previewImage,
-    toolList
+    toolList,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       visible:false,
@@ -255,7 +270,20 @@ export default {
       agnetInfo:{},
       total:0,
       setcol:24,
-      freefreightamount:''
+      freefreightamount:'',
+      addressparam: {
+        "id": "20221009155803",
+        "content": {
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":10,
+          "sys_enterpriseid":'',
+          "where":{
+            "condition":"",
+            "workaddress":1
+          }
+        }
+      },
     }
   },
   created () {
@@ -295,22 +323,12 @@ export default {
       this.queryFinancial()
     },
     // 收货信息:合作企业联系人
-    async receiveAddress () {
-      const res = await this.$api.requested({
-        "id": "20221009155803",
-        "content": {
-        "sys_enterpriseid":this.agnetInfo.sys_enterpriseid,
-          "where":{
-            "condition":"",
-            "workaddress":1
-          }
-        }
-      })
+    async receiveAddress (fn) {
+      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      const res = await this.$api.requested(this.addressparam)
+      this.addresstotal = res.total
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
-      console.log(res.data,this.defaultData.re_info)
     },
-
     // 账号信息
     async queryAccount () {
       const res = await this.$api.requested({

src/components/uploadAllData/index.vue

@@ -49,7 +49,7 @@ export default {
     /* 一键选择所有商品 */
     allProduct () {
       if (this.total > this.dataSize) {
-        this.$confirm(`总共有${this.total}个商品,提交时间较长,是否继续`,'提示',{
+        this.$confirm(`总共有${this.total}个商品,是否确定${this.type == 'upload' ? '提交' : '删除'}`,'提示',{
           confirmButtonText:'确定',
           cancelButtonText:'取消',
           type:'warning'
@@ -62,7 +62,7 @@ export default {
           }
         })
       } else {
-        this.$confirm(`总共有${this.total}个商品,是否继续`,'提示',{
+        this.$confirm(`总共有${this.total}个商品,是否确定${this.type == 'upload' ? '提交' : '删除'}`,'提示',{
           confirmButtonText:'确定',
           cancelButtonText:'取消',
           type:'warning'