2023-2-23

src/HDrpManagement/ProductMag/detail/index.vue

@@ -48,7 +48,7 @@
           :paramData="[{key:'isonsale',value:1}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
-          v-if="tool.checkAuth($route.name,'isTop') && mainData.isonsale == 0"
+          v-if="tool.checkAuth($route.name,'isTop') && mainData.isonsale == 0 && mainData.status == '新建'"
         />
         <customBtn 
           btnName="下架"
@@ -59,7 +59,7 @@
           :paramData="[{key:'isonsale',value:0}]"
           @onSuccess="queryMainData($route.query.id)"
           class="inline-16"
-          v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1"
+          v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1 &&  mainData.status == '新建'"
         />
       </div>
       <div slot="slot0" >

src/HDrpManagement/ProductMag/modules/add.vue

@@ -57,7 +57,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="领域" prop="tradefield">
+              <el-form-item label="领域" prop="tradefields">
                 <el-select style="width:100%" v-model="form.tradefields" multiple placeholder="请选择" clearable>
                   <el-option
                     v-for="item in tradefield"

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -57,7 +57,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="领域" prop="tradefield">
+              <el-form-item label="领域" prop="tradefields">
                 <el-select style="width:100%" v-model="form.tradefields" multiple placeholder="请选择" clearable>
                   <el-option
                     v-for="item in tradefield"

src/HDrpManagement/invoiceapp/modules/add.vue

@@ -13,14 +13,14 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" class="demo-form-inline" size="small" label-position="right" label-width="80px">
             <el-col :span="12">
-              <p class="normal-title normal-margin">经销商信息</p>
-              <el-form-item label="经销商" prop="enterprisename">
+              <p class="normal-title normal-margin">企业信息</p>
+              <el-form-item label="选择企业" prop="enterprisename">
                 <el-popover
                   placement="bottom"
                   trigger="click"
                   v-model="visible">
-                  <invoiceCanUseAgent ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
-                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent" suffix-icon="el-icon-arrow-down" placeholder="经销商"></el-input>
+                  <invoiceCanUseAgent :qiyi="true" ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
+                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent" suffix-icon="el-icon-arrow-down" placeholder="企业"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -123,6 +123,7 @@ export default {
         byhand:false,
         invoiceline:'p'
       },
+      accountAmount:'',
       value:'',
       rules:{
         enterprisename: [
@@ -181,8 +182,36 @@ export default {
     // 选择经销商
     selectRow (row) {
       this.visible = false
+      console.log(row);
+      
       this.form.enterprisename = row.enterprisename
       this.form.sys_enterpriseid = row.sys_enterpriseid
+      this.getAccountAmount(row.sys_enterpriseid)
+    },
+    /* 获取财务信息 */
+    async getAccountAmount (id) {
+      let res = await this.$api.requested({
+        "id": 20221013160602,
+        "content": {
+            "sys_enterpriseid":id,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        },
+      })
+      if (res.data && res.data.length > 0) {
+        this.accountAmount = res.data[0]
+        this.form.invo_enterprisename = this.accountAmount.enterprisename
+        this.form.taxno = this.accountAmount.taxno
+        this.form.address = this.accountAmount.address
+        this.form.phonenumber = this.accountAmount.phonenumber
+        this.form.bank = this.accountAmount.bank
+        this.form.bankcardno = this.accountAmount.bankcardno
+      }
+      console.log(res,'财务信息');
+      
     },
     // 选择开票信息
     selectTaxRow (row) {

src/HDrpManagement/invoiceapp/modules/edit.vue

@@ -12,15 +12,15 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" class="demo-form-inline" size="small" label-position="right" label-width="80px">
             <el-col :span="12">
-              <p class="normal-title normal-margin">经销商信息</p>
-              <el-form-item label="经销商">
+              <p class="normal-title normal-margin">企业信息</p>
+              <el-form-item label="选择企业">
                 <el-popover
                   placement="bottom"
                   trigger="click"
                   disabled
                   v-model="visible">
-                  <invoiceCanUseAgent ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
-                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent"  suffix-icon="el-icon-arrow-down" placeholder="经销商"></el-input>
+                  <invoiceCanUseAgent :qiyi="true" ref="UseAgent" @selectRow="selectRow"></invoiceCanUseAgent>
+                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryAgent"  suffix-icon="el-icon-arrow-down" placeholder="企业"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
@@ -129,6 +129,7 @@ export default {
         remarks:'',
         byhand:false,
       },
+      accountAmount:'',
       value:'',
       rules:{
         enterprisename: [
@@ -166,6 +167,32 @@ export default {
       this.visible = false
       this.form.enterprisename = row.enterprisename
       this.form.sys_enterpriseid = row.sys_enterpriseid
+      this.getAccountAmount(row.sys_enterpriseid)
+    },
+    /* 获取财务信息 */
+    async getAccountAmount (id) {
+      let res = await this.$api.requested({
+        "id": 20221013160602,
+        "content": {
+            "sys_enterpriseid":id,
+            "pageNumber": 1,
+            "pageSize": 20,
+            "where": {
+                "condition": ""
+            }
+        },
+      })
+      if (res.data && res.data.length > 0) {
+        this.accountAmount = res.data[0]
+        this.form.invo_enterprisename = this.accountAmount.enterprisename
+        this.form.taxno = this.accountAmount.taxno
+        this.form.address = this.accountAmount.address
+        this.form.phonenumber = this.accountAmount.phonenumber
+        this.form.bank = this.accountAmount.bank
+        this.form.bankcardno = this.accountAmount.bankcardno
+      }
+      console.log(res,'财务信息');
+      
     },
     // 选择开票信息
     selectTaxRow (row) {

src/HDrpManagement/orderManage/details/tabs/dispatch.vue

@@ -49,7 +49,7 @@ export default {
       param:{
         "id": 20221205111302,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": '',
           "pageNumber": 1,
           "pageSize": 17,
           "where": {
@@ -63,6 +63,7 @@ export default {
   },
   methods:{
     async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total

src/HDrpManagement/orderManage/details/tabs/logistics.vue

@@ -49,7 +49,7 @@ export default {
       param:{
         "id": 20221205111402,
         "content": {
-          "sa_orderid": 12,
+          "sa_orderid": '',
           "pageNumber": 1,
           "pageSize": 17,
           "where": {
@@ -63,6 +63,7 @@ export default {
   },
   methods:{
     async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
       const res = await this.$api.requested(this.param)
       this.tableData = res.data
       this.total = res.total

src/HDrpManagement/payvoucher/components/enterprise.vue

@@ -7,7 +7,7 @@
         width="900px"
         @close="onColes">
       <div slot="title" style="font-size: 15px">
-        选择单位
+        选择企业
       </div>
       <layout_table
           ref="projectTable"
@@ -43,7 +43,7 @@
 </template>
 
 <script>
-import layout_table from '../components/table'
+import layout_table from './table'
 export default {
   name: "enterprise",
   props:["visible","index"],

src/SDrpManagement/myaccountclass/index.vue

@@ -9,6 +9,9 @@
               <div class="acccounet__panel" :style="activeName == index?{border:'1px solid #d8dde8'}:''">
                 <p class="normal-margin">{{item.accountname}}</p>
                 <p class="normal-title" style="font-size:1.825rem" :style="activeName == index?{color:'#3874f6'}:''"><small>¥</small>&nbsp;{{tool.formatAmount(item.balance)}}</p>
+                <div class="score">
+                  <p style="margin-top:16px">信用额度:{{item.creditquota}}</p>
+                </div>
               </div>
             </el-col>
           </el-row>
@@ -73,6 +76,8 @@ export default {
         content:{}
       })
       this.acountlist = res.data
+      console.log(this.acountlist);
+      
       this.accountMx()
     },
     async accountMx () {

src/SManagement/setenterpriseInfo/modules/address/add.vue

@@ -81,6 +81,11 @@
               <el-input v-model="form.remarks" autocomplete="on" type="textarea" :rows="3" placeholder="输入联系人备注"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否默认" prop="isdefault">
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isdefault"></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -115,8 +120,9 @@ export default {
         "county":"",
         "address":"",
         "remarks":"",
-        "workaddress":0,
-        "value":[]
+        "workaddress":1,
+        "value":[],
+        "isdefault":0
       }
     }
   },

src/SManagement/setenterpriseInfo/modules/address/edit.vue

@@ -81,6 +81,11 @@
               <el-input v-model="form.remarks" autocomplete="on" type="textarea" :rows="3" placeholder="输入联系人备注"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否默认" prop="isdefault">
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isdefault"></el-checkbox>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -115,8 +120,9 @@ export default {
         "county":"",
         "address":"",
         "remarks":"",
-        "workaddress":0,
-        "value":[]
+        "workaddress":1,
+        "value":[],
+        "isdefault":0
       }
     }
   },
@@ -145,6 +151,7 @@ export default {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
         this.form.sys_enterpriseid = this.mainData.sys_enterpriseid
+        this.form.workaddress = 1
         const res = await this.$api.requested({
           "id": "20221009155703",
           "version":1,

src/SManagement/setenterpriseInfo/modules/address/list.vue

@@ -6,6 +6,9 @@
         <p v-if="scope.column.columnname === 'province'">
           {{scope.column.data['province']}}-{{scope.column.data['city']}}-{{scope.column.data['county']}}
         </p>
+        <p v-else-if="scope.column.columnname === 'isdefault'">
+          {{ scope.column.data.isdefault ? '是' : '否' }}
+        </p>
         <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
       </template>
        <template v-slot:opreation="scope">
@@ -43,7 +46,7 @@ export default {
         "sys_enterpriseid":this.mainData.sys_enterpriseid,
           "where":{
             "condition":"",
-            "workaddress":0
+            "workaddress":1
           }
         }
       })

src/components/normal-basic-layout/details/index.vue

@@ -149,7 +149,7 @@ export default {
       })
       this.tool.showMessage(res,() => {
         
-        window.open(this.$baseUrl + res.data + `&sa_contractid=${data}`)  
+        window.open(this.$baseUrl + res.data + `&${this.idname}=${data}`)  
       })
     },
     next () {

src/components/normal-basic-layout/index.vue

@@ -276,7 +276,7 @@ export default {
         }
       })
       this.tool.showMessage(res,() => {
-        window.open(this.$baseUrl + res.data + `&sa_contractid=${data.sa_contractid}`)  
+        window.open(this.$baseUrl + res.data + `&${this.idName}=${data[this.idName]}`)  
       })
     },
     clearSearchValue () {

src/template/invoiceCanUseAgent/index.vue

@@ -13,12 +13,12 @@
         border>
         <el-table-column
           prop="enterprisename"
-          label="经销商名称"
+          :label="qiyi ? '企业名称' : '经销商名称'"
           width="180">
         </el-table-column>
         <el-table-column
           prop="agentnum"
-          label="经销商编号"
+          :label="qiyi ? '企业编号' : '经销商编号'"
           width="180">
         </el-table-column>
          <el-table-column
@@ -76,6 +76,12 @@ export default {
       currentPage:0
     }
   },
+  props:{
+    qiyi: {
+      type:Boolean,
+      default: () => false
+    }
+  },
   methods:{
     async listData () {
       const res = await this.$api.requested(this.param)