主分支代码合并

src/HDrpManagement/contractModel/index.vue

@@ -1,11 +1,11 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="list" 
+    <basicLayout
+      ref="list"
       formPath="contractModel"
-      tableName="contractModelTable" 
-      idName="sa_contract_template_clauseids" 
+      tableName="contractModelTable"
+      idName="sa_contract_template_clauseids"
       :apiId="{query:20221128164602,del:20221125195702}"
       :options="options"
       @listData="listdata"
@@ -105,17 +105,17 @@ export default {
       this.$store.dispatch('DrawerShowChange',false)
     },
     listdata(data) {
-      console.log(data,'eeee');
+
     },
     detailBtn (data) {
       this.$store.dispatch('DrawerShowChange',true)
       this.$router.push({
         path:'/contractModelDetail',
         query:{
-          type:data.type=='项目' 
-            ? data.typemx=='直销' 
-              ? '1' : '2' 
-          : data.type == '框架' 
+          type:data.type=='项目'
+            ? data.typemx=='直销'
+              ? '1' : '2'
+          : data.type == '框架'
             ? '3' : data.type == '居间' ? '4' : '5',
         }
       })
@@ -125,4 +125,4 @@ export default {
 
 </script>
 <style scoped>
-</style>
+</style>

src/HDrpManagement/customerData/index.vue

@@ -1321,7 +1321,7 @@ export default {
     async getdataAll () {
       let res = await this.$api.requested(this.dataAllParam)
       this.dataAll = res.data
-      console.log(this.dataAll,'数据总览');
+
     },
     async departmentrtment() {
       const res = await this.$api.requested(this.depmentParam)
@@ -1421,10 +1421,9 @@ export default {
           x++
         }
       }
-      console.log(nowYear,'nowYear')
-      console.log(lastYear,'lastYear')
+
       this.newFollowup = lastYear.concat(nowYear)
-      console.log(this.newFollowup,'newFollowup')
+
       /*this.lineChart = res.data.tbzzl.map(item=>{
         return {
           date: item.date,

src/HDrpManagement/projectChange/index.vue

@@ -316,6 +316,7 @@ export default {
       this.projectLead = res2.data
 
 
+
     },
     /** 获取公司数据 */
     async getEnterprise () {

src/HDrpManagement/projectChange/modules/modules/andEnterprise/components/add.vue

@@ -245,11 +245,7 @@ export default {
   },
   methods:{
     onshow(){
-      console.log("新增企业缔约信息")
-      console.log(this.data)
       this.visible = true
-      console.log(this.enterpriseTypeList,'客户类型')
-      this.selectCustomer()
     },
     async onSubmit(){
       this.form.sa_projectid = this.$route.query.id

src/HManagement/clueManage/clue_public/modules/detail.vue

@@ -184,7 +184,7 @@ export default {
         }
       })
       this.mainData = res.data
-      console.log(this.$route.query.id,'111')
+
       this.selectList[0] = this.$route.query.id
       console.log(this.selectList[0])
       console.log(this.mainData);

src/SDrpManagement/QuotedPrice/detail/modules/contacts/modules/add.vue

@@ -135,11 +135,8 @@ export default {
 
       this.form.sys_enterpriseid = this.data.sys_enterpriseid
       this.form.enterprisename = this.data.enterprisename
-      console.log("***********//////////////")
-      console.log(this.form)
     },
     onSubmit(){
-      console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
@@ -159,4 +156,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -10,7 +10,7 @@
 
         <el-descriptions-item label="产品系列">
           <span v-for="(item,index) in basic.itemtype">
-            {{basic.itemtype.length === 0?item:index === basic.itemtype.length -1?item:item+','}}
+            {{basic.itemtype?basic.itemtype.length === 0?item:index === basic.itemtype.length -1?item:item+',':"--"}}
           </span>
         </el-descriptions-item>
         <el-descriptions-item label="客户">{{ basic.enterprisename?basic.enterprisename:"--" }}</el-descriptions-item>
@@ -29,7 +29,7 @@
         <el-descriptions-item label="状态" >
           <p :style="colorStyle">{{ basic.status?basic.status:"--" }}</p>
         </el-descriptions-item>
-        <el-descriptions-item label="负责人">{{ basic.leader.length !== 0?basic.leader[0].name:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="负责人">{{ basic.leader?basic.leader.length !== 0?basic.leader[0].name:"--":"--" }}</el-descriptions-item>
         <el-descriptions-item label="备注">{{ basic.remarks?basic.remarks:"--" }}</el-descriptions-item>
 
 
@@ -50,8 +50,8 @@
         <el-descriptions-item label="审核时间">{{ basic.checkdate?basic.checkdate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="复核人">{{ basic.recheckby?basic.recheckby:"--" }}</el-descriptions-item>
         <el-descriptions-item label="复核时间">{{ basic.recheckdate?basic.recheckdate:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="作废原因">{{ basic.deleteReason.length !== 0?basic.deleteReason[0].deletereason:'--'}}</el-descriptions-item>
-        <el-descriptions-item label-class-name="my-label" label="转手次数">{{ data.leader.length !== 0?data.leader[0].leadernum === 0?'0':data.leader[0].leadernum:'--' }}</el-descriptions-item>
+        <el-descriptions-item label="作废原因">{{ basic.deleteReason?basic.deleteReason.length !== 0?basic.deleteReason[0].deletereason:'--':"--"}}</el-descriptions-item>
+        <el-descriptions-item label-class-name="my-label" label="转手次数">{{ data.leader?data.leader.length !== 0?data.leader[0].leadernum === 0?'0':data.leader[0].leadernum:'--':"--" }}</el-descriptions-item>
       </el-descriptions>
     </div>
   </div>

src/components/socketMessage/index.vue

@@ -19,8 +19,8 @@
     data () {
       return {
         id:'',
-        // path:"ws://61.164.207.46:8000//yos/webSocket/",
-        path:"wss://oms.idcgroup.com.cn:8079/yos/webSocket/",
+        path:"ws://61.164.207.46:8000//yos/webSocket/",
+      /*  path:"wss://oms.idcgroup.com.cn:8079/yos/webSocket/",*/
         panelIsShow:false,
         list:[],
         total:0,