Browse Source

代码上传

zhangqiOMG 2 years ago
parent
commit
c7751bd847
27 changed files with 193 additions and 112 deletions
  1. 5 1
      src/HDrpManagement/AccountMoney/index.vue
  2. 1 1
      src/HDrpManagement/ProductGroupMag/components/shelves.vue
  3. 17 9
      src/HDrpManagement/ProductGroupMag/modules/add.vue
  4. 1 1
      src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue
  5. 1 1
      src/HDrpManagement/ProductGroupMag/modules/details.vue
  6. 25 25
      src/HDrpManagement/ProductGroupMag/modules/edit.vue
  7. 12 1
      src/HDrpManagement/ProductGroupMag/modules/table.vue
  8. 5 4
      src/HDrpManagement/ProductMag/detail/index.vue
  9. 1 6
      src/HDrpManagement/ProductMag/index.vue
  10. 17 8
      src/HDrpManagement/orderManage/details/index.vue
  11. 2 4
      src/HDrpManagement/orderManage/index.vue
  12. 12 2
      src/HDrpManagement/orderManage/modules/edit.vue
  13. 1 1
      src/HDrpManagement/payvoucher/details/modules/detailedData.vue
  14. 1 1
      src/HDrpManagement/recvoucher/details/modules/detailedData.vue
  15. 4 1
      src/HManagement/department/index.vue
  16. 2 2
      src/HManagement/department/staff/detail/index.vue
  17. 10 5
      src/HManagement/department/staff/list/modules/add.vue
  18. 3 1
      src/HManagement/department/staff/list/modules/edit.vue
  19. 1 2
      src/HManagement/siteManage/systemRemind/components/edit.vue
  20. 0 3
      src/SDrpManagement/ProductGroup/modules/Select.vue
  21. 0 3
      src/SDrpManagement/Products/modules/Select.vue
  22. 17 9
      src/SDrpManagement/agentOrder/details/index.vue
  23. 10 1
      src/SDrpManagement/agentOrder/modules/edit.vue
  24. 9 2
      src/SDrpManagement/myaccountclass/index.vue
  25. 16 8
      src/SDrpManagement/salerOrder/details/index.vue
  26. 8 1
      src/SDrpManagement/salerOrder/modules/edit.vue
  27. 12 9
      src/template/invoiceCanUseTax/index.vue

+ 5 - 1
src/HDrpManagement/AccountMoney/index.vue

@@ -6,7 +6,8 @@
       formPath="AccountMoney" 
       tableName="accountMoneyTable" 
       :apiId="{query:20221008145903}"
-      :options="options">
+      :options="options"
+      @listCreate="list">
       <template #custom>
         <div class="mt-10">
           <label class="search__label">企业:</label>
@@ -80,6 +81,9 @@ export default {
     this.getAccountType()
   },
   methods:{
+    list (param) {
+      param.content.sys_enterpiseid = JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+    },
     /** 获取公司数据 */
     async getEnterprise () {
       let res = await this.$api.requested({

+ 1 - 1
src/HDrpManagement/ProductGroupMag/components/shelves.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="onshow">{{data.isonsale === 0?'上 架':'下 架'}}</el-button>
+    <el-button size="mini" type="primary" @click="onshow">{{data.isonsale === 0?'上 架':'下 架'}}</el-button>
     <el-dialog
         title="提示"
         :visible.sync="upVisible"

+ 17 - 9
src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -35,7 +35,7 @@
 
             </el-col>
             <el-col :span="24 - col">
-              <Table :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
+              <Table type="add" :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
             </el-col>
             <el-col :span="col">
               <selectTable @addProduct="addProduct"></selectTable>
@@ -64,6 +64,7 @@ export default {
       drawer:false,
       col:0,
       tableData:[],
+      index:0,
       form: {
         sa_brandid: '',
         groupname: '',
@@ -102,6 +103,8 @@ export default {
       this.tableData = []
     },
     addProduct (row) {
+      this.index ++
+      row.sequence = this.index
       this.tableData.push(row)
       const res = new Map();
       this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
@@ -121,20 +124,25 @@ export default {
           message:'商品组明细不能为空',
           type:'error'
         })
-      const res = await this.$api.requested({
-        "id": "20220922164303",
-        "content": this.form
-      })
-      this.tool.showMessage(res,()=>{
-        this.groupdata = res.data
-        this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+      this.$refs.form.validate(async val => {
+        if (val) {
+          const res = await this.$api.requested({
+          "id": "20220922164303",
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.groupdata = res.data
+          this.index = 0
+          this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+        })
+        }
       })
+      
     },
     productChange (data) {
       this.form.itemno = data.itemno
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
-      
     },
     async onSuccess () {
       const res = await this.$api.requested({

+ 1 - 1
src/HDrpManagement/ProductGroupMag/modules/addGroupDetail.vue

@@ -15,7 +15,7 @@
         </div>
       </template>
     </tableLayout> -->
-    <Table :data="list" @deleteProduct="deleteProduct"></Table>
+    <Table type="edit" :data="list" @deleteProduct="deleteProduct"></Table>
     <el-pagination
       background
       small

+ 1 - 1
src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -80,7 +80,7 @@ export default {
           value:this.mainData.isonsale ? '上架' : '下架'
         },
         {
-          label:'产品',
+          label:'默认展示产品',
           value:this.mainData.itemname
         },
         /*{

+ 25 - 25
src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="editBtn">编 辑</el-button>
-    <el-drawer title="编辑商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body @close="onCancel">
+    <el-drawer title="编辑商品组" :visible.sync="drawer" size="30%" direction="rtl" append-to-body>
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="品牌:" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%" :disabled="true">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%">
                   <el-option v-for="item in brandList" :key="item.sa_brandid" :label="item.brandname"
                              :value="item.sa_brandid" size="small">
                   </el-option>
@@ -20,15 +20,17 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="序号:" prop="sequence">
-                <el-input type="text" size="small" v-model="form.sequence"></el-input>
+              <el-form-item label="默认商品:" prop="sequence">
+                <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
+                  <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
+                </selectProduct>
               </el-form-item>
             </el-col>
           </el-form>
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="drawer=false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -36,8 +38,10 @@
 </template>
 
 <script>
+import selectProduct from '@/template/selectProduct/index.vue'
 export default {
   props: ['data', 'type'],
+  components:{selectProduct},
   data () {
     return {
       drawer:false,
@@ -72,26 +76,6 @@ export default {
       this.drawer=true
       this.form = Object.assign({},this.form,this.data)
     },
-    onCancel(){
-      this.drawer = false
-      this.form={
-        sa_brandid: '',
-        groupname: '',
-        itemno: '',
-        tag: []
-      },
-      this.tableData = []
-    },
-    addProduct (row) {
-      this.tableData.push(row)
-      const res = new Map();
-      this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
-    },
-    deleteProduct (row) {
-      this.tableData = this.tableData.filter(e=>{
-        return e.itemid !== row.itemid
-      })
-    },
     async submit() {
       const res = await this.$api.requested({
         "id": "20220922164303",
@@ -102,6 +86,11 @@ export default {
         this.drawer = false
       })
     },
+    productChange (data) {
+      this.form.itemno = data.itemno
+      this.form.itemname = data.itemname
+      this.$refs.product.visible = false
+    },
     /* 可选择的品牌列表 */
     async getBrandList() {
       let res = await this.$api.requested({
@@ -114,6 +103,17 @@ export default {
           }
         }
       })
+
+      let res2 = await this.$api.requested({
+        "id": "20220923101603",
+        "version":1,
+        "content": {
+          "sa_itemgroupid":this.$route.query.id,
+          "pageNumber":1,
+          "pageSize":20
+        }
+      },)
+      this.tableData = res2.data
       this.brandList = res.data
       console.log(this.brandList,'品牌');
     },

+ 12 - 1
src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -21,6 +21,14 @@
           label="产品编号"
           width="180">
       </el-table-column>
+      <el-table-column
+          prop="sequence"
+          label="排序"
+          width="100" v-if="type == 'add'">
+        <template slot-scope="scope">
+            <el-input type="text" size="mini" @input="onInput()" v-model="scope.row.sequence"></el-input>
+        </template>
+      </el-table-column>
       <el-table-column
           prop="itemname"
           label="产品名称"
@@ -105,7 +113,7 @@ export default {
   components:{
     previewImage
   },
-  props:['data'],
+  props:['data','type'],
   data () {
     return {
     }
@@ -128,6 +136,9 @@ export default {
       res.code === 1?this.$emit('onSuccess'):this.tool.showMessage(res)
       
     },
+    onInput () {
+      this.$forceUpdate()
+    },
     deleteProduct (row) {
       this.$emit('deleteProduct',row)
     }

+ 5 - 4
src/HDrpManagement/ProductMag/detail/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
         ref="details"
         :titleText="mainData.itemname"
-        :oldFormPath="{edit:'HDrpManagement/ProductMag/modules'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20220923140602"
@@ -17,6 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
+        <Edit class="inline-16" :data="mainData" @onSuccess="queryMainData" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'"/>
         <customBtn 
           btnName="审核"
           message="确认审核当前商品吗?"
@@ -44,7 +44,7 @@
           message="确认上架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="$route.query.id"
+          :id="[+$route.query.id]"
           :paramData="[{key:'isonsale',value:1}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
@@ -55,7 +55,7 @@
           message="确认下架当前商品吗?"
           idName="20220923154802"
           keyName="itemids"
-          :id="$route.query.id"
+          :id="[+$route.query.id]"
           :paramData="[{key:'isonsale',value:0}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
@@ -80,6 +80,7 @@
 </template>
 
 <script>
+import Edit from '../modules/edit'
 import detail_data from './modules/detailedData'
 import saleClass from '../modules/saleClass.vue'
 import productPrice from '../modules/productPrice'
@@ -92,7 +93,7 @@ export default {
       mainAreaData:{}
     }
   },
-  components:{detail_data,saleClass,productPrice,addClass},
+  components:{detail_data,saleClass,productPrice,addClass,Edit},
   methods: {
     async queryMainData(id) {
       const res = await this.$api.requested({

+ 1 - 6
src/HDrpManagement/ProductMag/index.vue

@@ -49,12 +49,7 @@
       <template v-slot:tbList="scope">
         <div>
         <p :style="scope.data.column.data.isonsale === 1?'color:#52c41a':'color:red'" v-if="scope.data.column.columnname === 'isonsale'">
-          <el-switch
-            v-model="scope.data.column.data.isonsale"
-            :active-value='1'
-            :inactive-value='0'
-            @change="isOnSaleChange(scope.data.column.data)">
-          </el-switch>
+          {{ scope.data.column.data.isonsale ? '上架' : '下架' }}
         </p>
         <p v-else-if="scope.data.column.columnname === 'cover'">
           <previewImage v-if="scope.data.column.data.attinfos[0]" class="image" :image="scope.data.column.data.attinfos[0]" :list="scope.data.column.data.attinfos" :deletebtn="false"></previewImage>

+ 17 - 8
src/HDrpManagement/orderManage/details/index.vue

@@ -113,6 +113,11 @@ export default {
       selection:[]
     }
   },
+  provide () {
+    return {
+      thisDetail:() => this
+    }
+  },
   components:{
     defaultInfo,
     productList,
@@ -133,16 +138,20 @@ export default {
       this.value = res.data[0].value
     },
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        
+        this.changeDataStructure()
+        this.orderreviewtype()
+        re()
       })
-      this.mainData = res.data
       
-      this.changeDataStructure()
-      this.orderreviewtype()
     },
     changeDataStructure() {
       this.mainAreaData = [

+ 2 - 4
src/HDrpManagement/orderManage/index.vue

@@ -78,12 +78,10 @@
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'ischange'">
-          {{scope.data.column.data.ischange}}
-          {{ scope.data.column.data.ischange ? '是' : '否' }}
+          {{ +scope.data.column.data.ischange ? '是' : '否' }}
         </div>
         <div v-else-if="scope.data.column.columnname == 'isreturn'">
-          {{scope.data.column.data.isreturn}}
-          {{ scope.data.column.data.isreturn ? '是' : '否' }}
+          {{ +scope.data.column.data.isreturn ? '是' : '否' }}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

+ 12 - 2
src/HDrpManagement/orderManage/modules/edit.vue

@@ -64,6 +64,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -113,6 +114,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -216,7 +218,8 @@ import productList from '../details/tabs/productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
 import selectSaler from '@/template/selectSaler/index.vue'
-
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
@@ -224,8 +227,11 @@ export default {
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,
@@ -259,6 +265,10 @@ export default {
       billdate:''
     }
   },
+  mounted () {
+    console.log(this.data);
+    
+  },
   methods:{
     onShow () {
       this.initPage()

+ 1 - 1
src/HDrpManagement/payvoucher/details/modules/detailedData.vue

@@ -16,7 +16,7 @@
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源说明">{{ detailData.sourcenote?detailData.sourcenote:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ detailData.remarks?detailData.remarks:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"--" }}</el-descriptions-item>
+<!--        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"&#45;&#45;" }}</el-descriptions-item>-->
       </el-descriptions>
     </div>
 

+ 1 - 1
src/HDrpManagement/recvoucher/details/modules/detailedData.vue

@@ -17,7 +17,7 @@
         <el-descriptions-item label="凭证来源">{{ detailData.source?detailData.source:"--" }}</el-descriptions-item>
         <el-descriptions-item label="凭证来源说明">{{ detailData.sourcenote?detailData.sourcenote:"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ detailData.remarks?detailData.remarks:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"--" }}</el-descriptions-item>
+<!--        <el-descriptions-item label="创建人">{{ detailData.changeby?detailData.changeby:"&#45;&#45;" }}</el-descriptions-item>-->
       </el-descriptions>
     </div>
 

+ 4 - 1
src/HManagement/department/index.vue

@@ -37,7 +37,10 @@
         <div slot="custom"></div>
         <template v-slot:tbList="scope">
           <div>
-            <p v-if="scope.data.column.columnname === 'province'">
+            <div v-if="scope.data.column.columnname === 'phonenumber'">
+              <span>{{scope.data.column.data.accountno !== '' ? scope.data.column.data.userphonenumber : scope.data.column.data.phonenumber}}</span>
+            </div>
+            <p v-else-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
             <p v-else>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}</p>

+ 2 - 2
src/HManagement/department/staff/detail/index.vue

@@ -18,7 +18,7 @@
       </div>
       <div slot="customOperation" >
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
-<!--        <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>-->
+        <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
       </div>
       <div class="container normal-panel" slot="slot0" >
         <baseInfo :mainInfo="mainData"></baseInfo>
@@ -64,7 +64,7 @@ export default {
       this.mainAreaData = [
         {
           label:'电话',
-          value:this.mainData.phonenumber
+          value:this.mainData.accountno !== ''?this.mainData.userphonenumber:this.mainData.phonenumber
         },
         {
           label:'办公电话',

+ 10 - 5
src/HManagement/department/staff/list/modules/add.vue

@@ -100,7 +100,7 @@
       <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
     </div>
   </el-drawer>
-  <el-dialog
+<!--  <el-dialog
       title="授权角色"
       :visible.sync="drawer"
       width="564px"
@@ -126,10 +126,10 @@
       </el-row>
     </div>
     <div class="dialog-footer">
-<!--      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>-->
+&lt;!&ndash;      <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>&ndash;&gt;
       <el-button size="small" type="warning" @click="createUser" class="normal-btn-width btn-warning">确 定</el-button>
     </div>
-  </el-dialog>
+  </el-dialog>-->
 </div>
 </template>
 
@@ -246,9 +246,14 @@ export default {
             type: 'success'
           });
 
-          this.drawer = true
+          /*this.drawer = true*/
           this.roleForm.hrid = res.data.hrid
-          this.rolelist()
+          /*this.rolelist()*/
+        this.dialogFormVisible = false
+        this.refreshData()
+        this.$emit('onSuccess')
+        this.$store.dispatch('changeDetailDrawer',true)
+        this.$router.push({path:'/depManage/staffDetail',query:{id:res.data.hrid,rowindex:res.data.rowindex}})
 
       });
     },

+ 3 - 1
src/HManagement/department/staff/list/modules/edit.vue

@@ -34,7 +34,8 @@
           </el-col>
           <el-col class="mb-30" :span="12">
             <el-form-item label="手机号码:" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off"></el-input>
+              <el-input v-if="form.accountno === ''" v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off" ></el-input>
+              <el-input v-else v-model="form.userphonenumber" placeholder="输入手机号码" autocomplete="off" disabled></el-input>
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
@@ -167,6 +168,7 @@ export default {
             "hrid":this.$route.query.id
         }
       })
+      console.log(res.data,'编辑数据')
       this.form = Object.assign({},this.form, res.data)
     },
     async department () {

+ 1 - 2
src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -129,9 +129,8 @@ export default {
     /* 角色选择结果 */
     roleResult (result) {
       this.form.rolename = result.map(item => item.rolename).join(',')
-      this.form.rolemsg = result.map(item => item.rolename)
       this.form.roleids = result.map(item => item.roleid)
-      console.log(this.form.rolemsg);
+      console.log(this.form.rolename,result);
       
     },
     /* 人员选择结果 */

+ 0 - 3
src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -134,9 +134,6 @@ export default {
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
-.normal-margin{
-  margin-bottom: 2px !important;
-}
 .border-all{
   margin-left: 0px
 }

+ 0 - 3
src/SDrpManagement/Products/modules/Select.vue

@@ -134,9 +134,6 @@ export default {
   padding-bottom:16px;
   border-bottom: 1px solid #e3e5ea;
 }
-.normal-margin{
-  margin-bottom: 2px !important;
-}
 .border-all{
   margin-left: 0px
 }

+ 17 - 9
src/SDrpManagement/agentOrder/details/index.vue

@@ -76,6 +76,11 @@ export default {
       dialogVisible:false
     }
   },
+  provide() {
+    return {
+      thisDetail: () => this
+    }
+  },
   components:{
     Edit,
     defaultInfo,
@@ -89,16 +94,20 @@ export default {
   },
   methods:{
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        console.log(this.mainData);
+        
+        this.changeDataStructure()
+        re()
       })
-      this.mainData = res.data
-      console.log(this.mainData);
       
-      this.changeDataStructure()
     },
     changeDataStructure() {
       let that = this
@@ -288,5 +297,4 @@ export default {
 </script>
 
 <style scoped>
-
 </style>

+ 10 - 1
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -53,6 +53,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -104,6 +105,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -196,14 +198,19 @@ import previewImage from '@/components/previewImage/index.vue'
 import productList from './productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,
@@ -258,6 +265,8 @@ export default {
         "id": "20230220002602",
         "content": {
           "pageSize":100,
+          "pageNumber":1,
+          "sys_enterpriseid":this.data.sys_enterpriseid,
           "where": {
               "condition": ""
           }

+ 9 - 2
src/SDrpManagement/myaccountclass/index.vue

@@ -17,7 +17,12 @@
           </el-row>
           <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :fixedName="'operation'" height="calc(100vh - 390px)">
             <template v-slot:customcol="scope">
-              <p>{{scope.column.data[scope.column.columnname]}}</p>
+              <div v-if="scope.column.columnname == 'type'">
+                {{ scope.column.data.type ? '收入凭证' : '支出凭证' }}
+              </div>
+              <div v-else>
+                {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
+              </div>
             </template>
             <template v-slot:opreation="scope">
               <editPrice v-if="tool.checkAuth($route.name,'update')" class="inline-16" :data="scope.data"/>
@@ -73,7 +78,9 @@ export default {
     async listData () {
       const res = await this.$api.requested({
         id:"20221008145903",
-        content:{}
+        content:{
+          "sys_enterpriseid":JSON.parse(window.sessionStorage.getItem('accountinfo')).enterprise.sys_enterpriseid
+        }
       })
       this.acountlist = res.data
       console.log(this.acountlist);

+ 16 - 8
src/SDrpManagement/salerOrder/details/index.vue

@@ -75,6 +75,11 @@ export default {
       dialogVisible:false
     }
   },
+  provide () {
+    return {
+      thisDetail:() => this
+    }
+  },
   components:{
     defaultInfo,
     productList,
@@ -87,15 +92,18 @@ export default {
   },
   methods:{
     async queryMainData(id) {
-      const res = await this.$api.requested({
-        "id":'20221108151302',
-        "content": {
-          "sa_orderid": this.$route.query.id
-        }
+      return new Promise(async (re,rj) => {
+        const res = await this.$api.requested({
+          "id":'20221108151302',
+          "content": {
+            "sa_orderid": this.$route.query.id
+          }
+        })
+        this.mainData = res.data
+        this.changeDataStructure()
+        re()
       })
-      this.mainData = res.data
-      this.changeDataStructure()
-      console.log(this.mainData);
+      
       
     },
     changeDataStructure() {

+ 8 - 1
src/SDrpManagement/salerOrder/modules/edit.vue

@@ -53,6 +53,7 @@
               title="选择财务信息"
               trigger="click"
               v-model="visible2">
+              <addAmountInfo style="text-align:right" :data="{sys_enterpriseid:data.sys_enterpriseid}" @onSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"/>
               <el-table
                 :data="financiallist"
                 style="width: 100%"
@@ -104,6 +105,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -196,14 +198,19 @@ import previewImage from '@/components/previewImage/index.vue'
 import productList from './productlist.vue'
 import addProduct from '@/template/orderCanUseProduct/index.vue'
 import financeEnterprise from '@/template/orderCanUseFinance/index.vue'
+import addAmountInfo from '@/components/financialInfo/modules/add'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
     productList,
     addProduct,
-    financeEnterprise
+    financeEnterprise,
+    addAmountInfo,
+    addAddressInfo
   },
+  inject:['thisDetail'],
   data () {
     return {
       checked:0,

+ 12 - 9
src/template/invoiceCanUseTax/index.vue

@@ -12,25 +12,28 @@
         border>
         <el-table-column
           prop="enterprisename"
-          label="经销商名称"
+          label="开票单位"
           width="180">
         </el-table-column>
         <el-table-column
-          prop="agentnum"
-          label="经销商编号"
+          prop="taxno"
+          label="号"
           width="180">
         </el-table-column>
          <el-table-column
-          prop="contact"
-          label="联系人"
+          prop="address"
+          label="开票地址"
           width="90">
         </el-table-column>
         <el-table-column
-          label="地址"
+          label="开户行"
+          prop="bank"
+          width="180">
+        </el-table-column>
+        <el-table-column
+          label="开票账户"
+          prop="bankcardno"
           width="180">
-          <template slot-scope="scope">
-            {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
-          </template>
         </el-table-column>
         <el-table-column
           label="操作"