Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -577,6 +577,7 @@ export default {
     queryItemType(){
       this.$store.dispatch('optiontypeselect','itemtype').then(res => {
         this.itemtype = res.data
+        this.form.itemtype[0] = res.data[0].value
       })
     },
     /*修改折扣数据*/
@@ -635,6 +636,9 @@ export default {
   mounted() {
     const date = new Date()
     this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+    let endDate = new Date(date.setDate(date.getDate() + 30)).toLocaleDateString()
+    endDate = endDate.replace(/\//g,'-')
+    this.form.date = [this.form.billdate,endDate]
     this.form.sa_projectid = this.data.sa_projectid
     this.form.projectname = this.data.projectname
     this.form.projectnum = this.data.projectnum

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/add.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" type="primary" @click="onshow">新增客新建户地址</el-button>
+    <el-button size="small" type="primary" @click="onshow">新建</el-button>
     <el-drawer
         title=" 新建客户地址"
         :visible.sync="dialogFormVisible"

src/HManagement/addressList/addressBook/index.vue

@@ -7,9 +7,11 @@
         :apiId="{query:20231220085804,del:''}"
         :autoQuery="false"
         @onSuccess="selectChange"
+        @listData="queryList"
     >
       <template #titleLight>
-        <addContact :tagList="tagList" v-if="tool.checkAuth($route.name,'addContact')" slot="addContact" :group="group" @onAddSuccess="selectChange"></addContact>
+        <addContact class="inline-16" :tagList="tagList" v-if="tool.checkAuth($route.name,'addContact')" slot="addContact" :group="group" @onAddSuccess="selectChange"></addContact>
+        <exportFile class="inline-16" :param="paramExport" :columns="tablecols" file-name="通讯录"></exportFile>
       </template>
       <template #custom>
         <div class="mt-10" v-if="usertype === 0">
@@ -90,10 +92,12 @@
           <div>{{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]] === 0?'否':'是':'否'}}</div>
         </div>
         <div v-else-if="scope.data.column.columnname === 'orderamount'">
-          <div>{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):'--'}}</div>
+          <div>{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ ' + tool.formatAmount(0,2):'--'}}</div>
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:
+            scope.data.column.data[[scope.data.column.columnname]] == 0 && (scope.data.column.columnname == 'followupqty' || scope.data.column.columnname == 'customersqty' || scope.data.column.columnname == 'projectqty'  || scope.data.column.columnname == 'quotedpriceqty'  || scope.data.column.columnname == 'orderqty')
+                ?0:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
@@ -108,11 +112,13 @@
 import normalBook from "@/components/normal-basic-layout-new/normalBook";
 import myGroup from '../mycontact/index';
 import addContact from '../mycontact/modules/addContact'
+import exportFile from '@/components/export_file/index5'
 export default {
   name: "index",
-  components:{normalBook,myGroup,addContact},
+  components:{normalBook,myGroup,addContact,exportFile},
   data(){
     return {
+      tablecols:[],
       tabIndex:"1",
       editableTabsValue:"我负责的",
       usertype:JSON.parse(sessionStorage.getItem('active_account')).usertype,
@@ -184,10 +190,14 @@ export default {
       },
       groupname:'',
       contactstype:'',
-      isShow:true
+      isShow:true,
+      paramExport:{}
     }
   },
   methods:{
+    queryList(){
+      this.paramExport = this.$refs.basicLayout.param
+    },
     async listData(id){
       this.$refs.basicLayout.param.content.type = this.tabName
       this.$nextTick(()=>{
@@ -304,6 +314,9 @@ export default {
   mounted() {
     /*this.querytemplet()*/
     this.listData(1)
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name).phoneBookTable.tablecols
   }
 }
 </script>

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" size="mini" icon="el-icon-plus" @click="onShow">新建联系人</el-button>
+    <el-button type="primary" size="small" icon="el-icon-plus" @click="onShow">新建联系人</el-button>
     <el-drawer title="新建联系人" append-to-body :visible.sync="dialogFormVisible" size="664px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="20">

src/HManagement/clueManage/m_activity/modules/detailTable.vue

@@ -9,7 +9,8 @@
       <el-option label="业务员" value="业务员">
       </el-option>
       </el-select> -->
-      <el-input class="inline-16" type="text" v-model="params.content.where.condition" size="small" style="width:200px" placeholder="请输入搜索内容" @keyup.native.enter="getList(params.content.pageNumber=1)"></el-input>
+      <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="getList(params.content.pageNumber=1)" @clear="getList(params.content.pageNumber=1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+      </el-input>
       <slot name="addClue" />
     </div>
     <tableNewLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :width="true" height="calc(100vh - 345px)" fixedName="operation">

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -133,7 +133,7 @@
                     style="width:100%;"
                     v-model="form.itemtype"
                     multiple
-                    placeholder="请选择产品系列"
+                    placeholder=""
                     size="mini"
                 >
                   <el-option
@@ -542,6 +542,7 @@ export default {
     queryItemType(){
       this.$store.dispatch('optiontypeselect','itemtype').then(res => {
         this.itemtype = res.data
+        this.form.itemtype[0] = res.data[0].value
       })
     },
     /*业务员*/
@@ -640,6 +641,9 @@ export default {
     }
     const date = new Date()
     this.form.billdate = date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate()
+    let endDate = new Date(date.setDate(date.getDate() + 30)).toLocaleDateString()
+    endDate = endDate.replace(/\//g,'-')
+    this.form.date = [this.form.billdate,endDate]
     this.form.sa_quotedpriceid = 0
     this.queryItemType()
     this.queryID()

src/components/socketMessage/index.vue

@@ -20,7 +20,7 @@
       return {
         id:'',
         /*path:"ws://61.164.207.46:8000//yos/webSocket/",*/
-        path:"ws://61.164.207.46:8001/yos/webSocket/",
+        path:"wss://oms.idcgroup.com.cn:8079/yos/webSocket/",
         panelIsShow:false,
         list:[],
         total:0,
@@ -28,9 +28,10 @@
     },
     created () {
       let token = JSON.parse(sessionStorage.getItem('active_account')).token
-      let href =location.href.substring(0,5)
-      console.log(href,'href')
-      href === 'https'?this.path = "wss://oms.idcgroup.com.cn:8079/yos/webSocket/":this.path = "ws://61.164.207.46:8000//yos/webSocket/"
+     /* let href =location.href.substring(0,5)
+      console.log(href,'href')*/
+      // href === 'https'?this.path = "wss://oms.idcgroup.com.cn:8079/yos/webSocket/":this.path = "ws://61.164.207.46:8000//yos/webSocket/"
+
       this.path = this.path + token
       console.log(this.path)
     },

src/views/salesData/modules/quotationAnalysis.vue

@@ -45,7 +45,8 @@
           </div>
         </div>
         <div class="chart">
-          <div id="quotationAnalysisChart" :style="{height: isFull?heightChart:windowWidth>1435?'100%':'90%'}"></div>
+<!--          <div id="quotationAnalysisChart" :style="{height: isFull?heightChart:windowWidth>1435?'90%':'90%'}"></div>-->
+          <div id="quotationAnalysisChart" :style="{height: isFull?heightChart:windowWidth<1660?'90%':windowWidth<1676?'90%':'100%'}"></div>
         </div>
       </div>
     </div>