Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/bankStatement/modules/detail.vue

@@ -3,7 +3,7 @@
   <div>
     <basicDetails
         ref="details"
-        :titleText="mainData.accname"
+        :titleText="mainData.oppname"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20230106154004"

src/HDrpManagement/orderManage/details/index.vue

@@ -502,6 +502,7 @@ export default {
       if (res.data !== '成功') {
         this.errorUrl = res.data
       }
+      this.queryMainData()
     }
   },
   mounted () {

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

@@ -10,7 +10,7 @@
         ref="multipleTable"
         :data="tableData"
         size="small"
-        height="calc(100vh - 500px)"
+        max-height="500px"
         stripe
         border
         @selection-change	="selectionChange">
@@ -371,6 +371,11 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      setTimeout(() => {
+         this.$nextTick(() => {
+          this.$refs.multipleTable.doLayout()
+        });
+      }, 300);
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -544,17 +549,11 @@ export default {
     })
     console.log(this.columnTitle)
   },
-  watch:{
-    listData () {
-      this.$nextTick(() => {
-          this.$refs.mutipleTable.doLayout();
-      });
-
-    }
-  }
 }
 
 </script>
-<style scoped>
-
+<style>
+body .el-table th.gutter{
+display: table-cell!important;
+}
 </style>

src/HDrpManagement/reportcenter/index.vue

@@ -55,7 +55,9 @@ export default {
       })
       console.log(res);
       this.tool.showMessage(res,() => {
-        window.open(this.$baseUrl + res.data)  
+        console.log(this.tool.getBaseUrl(),res.data);
+        
+        window.open(this.tool.getBaseUrl() + res.data)  
       })
       
     }

src/HManagement/department/staff/detail/modules/createUser.vue

@@ -18,6 +18,8 @@
                     :key="item.index"
                     :label="item.rolename"
                     :value="item.roleid">
+                    <span style="float: left">{{ item.rolename }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </el-option>
                 </el-select>
               </el-form-item>

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -144,14 +144,14 @@ export default {
           label:'报价类型',
           value:this.mainData.quotedpricetype
         },
-        {
-          label:'项目编号',
-          value:this.mainData.projectnum
-        },
-        {
-          label:'项目名称',
-          value:this.mainData.projectname
-        },
+        // {
+        //   label:'项目编号',
+        //   value:this.mainData.projectnum
+        // },
+        // {
+        //   label:'项目名称',
+        //   value:this.mainData.projectname
+        // },
         {
           label:'报价日期',
           value:this.mainData.billdate

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

@@ -5,8 +5,8 @@
         <div slot="title" class="my-label__title">基本信息</div>
         <el-descriptions-item label="单号">{{ basic.billno?basic.billno:"--" }}</el-descriptions-item>
         <el-descriptions-item label="报价类型">{{ basic.quotedpricetype?basic.quotedpricetype:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item>
+        <!-- <el-descriptions-item label="项目编号">{{ basic.projectnum?basic.projectnum:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="项目名称">{{ basic.projectname?basic.projectname:"--"}}</el-descriptions-item> -->
         <el-descriptions-item label="产品系列">
           <span v-for="(item,index) in basic.itemtype">
             {{basic.itemtype.length === 0?item:index === basic.itemtype.length -1?item:item+','}}

src/SDrpManagement/agentOrder/details/index.vue

@@ -369,6 +369,7 @@ export default {
       if (res.data !== '成功') {
         this.errorUrl = res.data
       }
+      this.queryMainData()
     }
   },
   mounted () {

src/SDrpManagement/salerOrder/details/index.vue

@@ -399,6 +399,7 @@ export default {
       if (res.data !== '成功') {
         this.errorUrl = res.data
       }
+      this.queryMainData()
     },
     reback () {
       this.$confirm('确定撤回订单吗?', '提示', {

src/SManagement/user/user-info/components/baseInfo.vue

@@ -147,6 +147,11 @@ export default {
   },
   methods: {
     save(type) {
+      if(!this.ruleForm.phonenumber) return this.$notify({
+          title:'提示',
+          message:'请填写手机号',
+          type: 'warning'
+        })   
       this.$refs.ruleForm.validate(async val => {
         if(!val) return  this.$notify({
           title:'提示',

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites