Browse Source

代码更新

qymljy 2 years ago
parent
commit
ac95bb0c3e

+ 36 - 1
src/Form/QuotedPrice/edit.vue

@@ -453,6 +453,7 @@ export default {
   methods:{
     onShow(){
       this.drawer = true
+      console.log("编辑内容3",this.data)
       this.form = Object.assign({},this.form,this.data)
       this.form.date[0] = this.form.begdate
       this.form.date[1] = this.form.enddate
@@ -694,12 +695,46 @@ export default {
       this.$store.dispatch('optiontypeselect','itemtype').then(res => {
         this.itemtype = res.data
       })
-    }
+    },
+   /* async mainData(val) {
+      const res = await this.$api.requested({
+        "id": 20220930103501,
+        "content": {
+          "ownertable":"sa_quotedprice",
+          "ownerid":this.$route.query.id
+        }
+      })
+      if (this.mainData.leader.length !== 0){
+        if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
+
+          this.mainData.disabled = true
+        }else {
+          let flag = 0
+          for (var i=0;i<res.data[0].team.length;i++){
+            if (res.data[0].team[i].userid === JSON.parse(window.sessionStorage.getItem('active_account')).userid){
+              if (res.data[0].team[i].editable === 1){
+                this.mainData.disabled = true
+                flag =1
+                break
+              }else {
+                flag = 0
+                break
+              }
+            }
+          }
+          /!*不是负责人*!/
+          flag === 0?this.mainData.disabled = false:this.mainData.disabled = true
+        }
+      }
+      console.log("权限结果",this.mainData.disabled)
+    }*/
   },
   mounted() {
     this.queryItemType()
+    console.log("编辑内容2",this.data)
   },
   created() {
+    console.log("编辑内容1",this.data)
   }
 }
 </script>

+ 3 - 0
src/Form/projectChange/edit.vue

@@ -286,6 +286,9 @@ export default {
       this.form = Object.assign({},this.form,this.data)
       this.form.province = [this.form.province,this.form.city,this.form.county]
       /*this.form.grade = parseInt(this.form.grade)*/
+      if (this.form.brandname === ''){
+        this.form.sa_brandid = ''
+      }
       this.form.tradefields = JSON.parse(this.form.tradefields)
       console.log(this.form,"项目商机内容")
     },

+ 3 - 1
src/HDrpManagement/projectChange/modules/detail.vue

@@ -205,7 +205,9 @@ export default {
         }
       })
 
-      this.mainData = res.data
+
+    /*  this.mainData = res.data*/
+      this.mainData = Object.assign({},this.mainData,res.data)
     /*  if (this.mainData.discountrate > 1){
         this.mainData.discountrate = Math.round(this.mainData.discountrate)
       }else {

+ 70 - 5
src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -8,7 +8,7 @@
         :mainAreaData="mainAreaData"
         :turnPageId="20221011133602"
         idname="sa_customersid"
-        :tabs="['详细信息','联系人信息','客户地址','银行卡信息']"
+        :tabs="['详细信息','联系人信息','客户地址','开票信息','项目商机','报价单','关联合同','账户余额','银行卡信息','线索']"
         @pageChange="pageChange"
         @onEditSuccess="onEditSuccess">
       <div slot="tags">
@@ -38,9 +38,30 @@
       <div slot="slot2">
         <address_manage :data="mainData"></address_manage>
       </div>
-      <div slot="slot3" >
+      <div slot="slot3" class=" normal-panel">
+        <financial :mainData="mainData"  ></financial>
+      </div>
+      <div slot="slot4" class="normal-panel">
+        <projectChange :data="mainData" ></projectChange>
+      </div>
+      <div slot="slot5" class="normal-panel">
+        <quotedPrice :data="mainData"  ></quotedPrice>
+      </div>
+      <div slot="slot6" class="normal-panel">
+        <contract :data="mainData" ></contract>
+      </div>
+      <div slot="slot7" class="normal-panel">
+        <accountMoney :data="mainData"  ></accountMoney>
+      </div>
+      <div slot="slot8" class="normal-panel">
         <bankCard :data="mainData" ></bankCard>
       </div>
+      <div slot="slot9" class="normal-panel">
+        <followLeads :data="mainData"  ></followLeads>
+      </div>
+<!--      <div slot="slot3" >
+        <bankCard :data="mainData" ></bankCard>
+      </div>-->
       <!-- <div slot="slot0" class="container normal-panel">
         <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建经销商主账号</el-button>
         <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="false" height="300px"></tableLayout>
@@ -66,10 +87,18 @@ import receive from './detail/operation/receive'
 import distribution from './detail/operation/distribution'
 import to_void from './detail/operation/toVoid'
 import bankCard from './detail/bankCard/index'
+import financial from '@/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/index.vue'
+import projectChange from '@/SDrpManagement/salerPrivatecustomer/detail/modules/projectChange/list'
+import quotedPrice from '@/SDrpManagement/salerPrivatecustomer/detail/modules/quotedPrice/list'
+import contract from '@/SDrpManagement/salerPrivatecustomer/detail/modules/contract/index'
+import accountMoney from '@/SDrpManagement/salerPrivatecustomer/detail/modules/accountMoney/index'
+import followLeads from '@/SDrpManagement/salerPrivatecustomer/detail/modules/followLeads/index'
 export default {
   data () {
     return {
-      mainData:{},
+      mainData:{
+        disabled:true
+      },
       mainAreaData:[],
       customerType:'',
       customerLead:'',
@@ -90,7 +119,43 @@ export default {
     }
   },
   components:{
-    detailed,contacts,address_manage,receive,distribution,to_void,bankCard
+    detailed,contacts,address_manage,receive,distribution,to_void,bankCard,
+    financial,projectChange,quotedPrice,contract,accountMoney,followLeads
+  },
+  watch:{
+    async mainData(val) {
+      const res = await this.$api.requested({
+        "id": 20220930103501,
+        "content": {
+          "ownertable":"sa_customers",
+          "ownerid":this.$route.query.id
+        }
+      })
+      console.log(res.data[0].team,'数据团队')
+      if (this.mainData.leader.length !== 0){
+        if (JSON.parse(window.sessionStorage.getItem('active_account')).userid === this.mainData.leader[0].userid){
+          /*是负责人*/
+          this.mainData.disabled = true
+        }else {
+          let flag = 0
+          for (var i=0;i<res.data[0].team.length;i++){
+            if (res.data[0].team[i].userid === JSON.parse(window.sessionStorage.getItem('active_account')).userid){
+              if (res.data[0].team[i].editable === 1){
+                this.mainData.disabled = true
+                flag =1
+                break
+              }else {
+                flag = 0
+                break
+              }
+            }
+          }
+          /*不是负责人*/
+          flag === 0?this.mainData.disabled = false:this.mainData.disabled = true
+        }
+      }
+      console.log("权限结果", this.mainData.disabled)
+    }
   },
   methods:{
     /* 获取系统选项数据 */
@@ -147,7 +212,7 @@ export default {
       })
        this.$refs.details.param.content.where.sa_customerpoolid = this.$route.query.tabIndex
       this.$refs.details.param.content.isExport = false
-      this.mainData = res.data
+      this.mainData = Object.assign({},this.mainData,res.data)
       this.length = this.mainData.leader.length
       console.log(this.length,"长度")
       this.getDataTag(this.mainData.sa_customersid)

+ 3 - 2
src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -68,7 +68,7 @@ export default {
   data(){
     return {
       mainData:{
-        disabled:false,
+        disabled:true,
       },
       mainAreaData:[],
       disabled:false,
@@ -138,7 +138,8 @@ export default {
           "sa_quotedpriceid":id
         }
       })
-      this.mainData = res.data
+      /*this.mainData = res.data*/
+      this.mainData = Object.assign({},this.mainData,res.data)
       console.log(this.mainData)
       this.productList()
       /*this.$refs.productList.productData()*/

+ 6 - 6
src/SDrpManagement/QuotedPrice/detail/modules/productInventory/index.vue

@@ -145,7 +145,7 @@
             prop="num"
             label="数量"
             width="160"
-            fixed="right">
+           >
           <template slot-scope="scope">
             <span>
               <el-input-number :disabled="!saveShow || index !== scope.row.rowindex" v-model="scope.row.qty" size="mini"  :min="1" label="描述文字" @change="onChangeNum(scope.row.qty,scope.row,scope.$index)"></el-input-number>
@@ -156,7 +156,7 @@
             prop="marketprice"
             label="牌价"
             width="80"
-            fixed="right">
+            >
           <template slot-scope="scope">
             <p><span>{{scope.row.marketprice?scope.row.marketprice:'--'}}</span></p>
           </template>
@@ -165,7 +165,7 @@
             prop="discountrate"
             label="折扣(%)"
             width="80"
-            fixed="right">
+            >
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount > 0 ">
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{scope.row.discountrate}}</span></p>
@@ -194,7 +194,7 @@
             prop="mindiscountrate"
             label="最低授权折扣(%)"
             width="80"
-            fixed="right">
+            >
           <template slot-scope="scope">
             <p><span>{{scope.row.mindiscountrate}}</span></p>
           </template>
@@ -203,7 +203,7 @@
             prop="price"
             label="单价"
             width="80"
-            fixed="right">
+           >
           <template slot-scope="scope">
             <div v-if="scope.row.discountDifferenceAmount > 0 ">
               <p v-if="!saveShow || index !== scope.row.rowindex"><span :style="[setTopColor]">{{tool.formatAmount(scope.row.price,2)}}</span></p>
@@ -231,7 +231,7 @@
             prop="discountDifferenceAmount"
             label="授权折扣差额"
             width="80"
-            fixed="right">
+            >
           <template slot-scope="scope">
             <p><span>{{scope.row.discountDifferenceAmount}}</span></p>
           </template>