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

# Conflicts:
#	vue.config.js

src/HDrpManagement/Creditbilladj/modules/details.vue

@@ -180,7 +180,7 @@ export default {
   },
   created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   },
 }
 

src/HDrpManagement/competitor/detail/index.vue

@@ -120,7 +120,7 @@ export default {
   },
   created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
     this.tool.checkAuth(this.$route.name,'toVoid')?'':this.$router.go(-1)
   },
 }

src/HDrpManagement/orderManage/details/index.vue

@@ -50,7 +50,6 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot1">
-        
         <product-list @select="select" :data="mainData" ref="prod">
           <div slot="operation">
             <changeOrderMx v-if="mainData.status === '审核'" class="inline-16" :data="selection" @onSuccess="$refs['prod'].listData()"></changeOrderMx>

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

@@ -4,7 +4,7 @@
       <div class="flex-align-center">
         <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
         <slot name="operation"></slot>
-        <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+        <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
       </div>
       <el-table
         ref="multipleTable"
@@ -209,7 +209,16 @@
       </div>
     </el-col>
     <el-col :span="24 - setcol">
-      <addProduct :data="data" @onConfirm="onConfirm"></addProduct>
+      <el-drawer
+        title="添加商品"
+        :visible.sync="drawer"
+        append-to-body
+        size="80%"
+        direction="rtl">
+          <div class="drawer__panel">
+            <addProduct :drawer="drawer" :data="data" @onConfirm="onConfirm"></addProduct>
+          </div>
+      </el-drawer>
     </el-col>
   </el-row>
 </template>
@@ -225,6 +234,7 @@ export default {
   },
   data () {
     return {
+      drawer:false,
       dataRefresh:true,
       setcol:24,
       tableData:[],
@@ -399,7 +409,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.setcol = 24
+        this.drawer = false
         this.listData()
         this.$emit('onSuccess')
       })

src/HDrpManagement/privateCustomer/modules/detail.vue

@@ -159,7 +159,7 @@ export default {
   },
   created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
     this.queryMainData(this.$route.query.id)
     this.getSysOption()
     this.query_arealist()

src/HDrpManagement/productMoneyOdd/modules/detail.vue

@@ -124,7 +124,7 @@ export default {
   },
   created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
     this.queryMainData(this.$route.query.id)
   },
 }

src/HDrpManagement/projectChange/modules/detail.vue

@@ -505,7 +505,7 @@ export default {
     this.getEnterprise()
     this.getSysetms()
     // 验证权限
-   /* this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)*/
+   /* // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)*/
 
   },
 }

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

@@ -114,7 +114,7 @@ export default {
   },
   async created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   },
 }
 

src/HDrpManagement/projectChange/modules/modules/rival/modules/detail.vue

@@ -116,7 +116,7 @@ export default {
   },
   async created () {
     // 验证权限
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   },
 }
 

src/HManagement/marketing2/agent/details/index.vue

@@ -291,7 +291,7 @@ export default {
     // 获取表结构
     this.tablecols = this.tool.tabelCol(this.$route.name)['agentGrouptable'].tablecols
     // 验证权限
-    /*this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)*/
+    /*// this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)*/
   },
 }
 

src/HManagement/projectTarget/target/modules/edit/index.vue

@@ -176,7 +176,7 @@ export default {
   },
   created () {
     this.onlyread = this.$route.query.type === 'onlyread'?true:false
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   }
 }
 

src/HManagement/projectTarget/target/modules/edit/indexCopy.vue

@@ -106,7 +106,7 @@ export default {
   },
   created () {
     this.onlyread = this.$route.query.type === 'onlyread'?true:false
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   }
 }
 

src/HManagement/roleManage/modules/roleContent copy.vue

@@ -221,7 +221,7 @@ export default {
   },
   created () {
     // 验证是否有编辑权限,若无权限则弹出
-    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   }
 }
 

src/HManagement/roleManage/modules/roleContent.vue

@@ -217,7 +217,7 @@ export default {
   },
   created () {
     // 验证是否有编辑权限,若无权限则弹出
-    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   }
 }
 

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,8 +1,12 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
+<<<<<<< HEAD
+    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
+=======
     <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
     <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+>>>>>>> d8fdba3a2fd4ae678e15dee665c95eeaa4bd568b
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -159,7 +163,16 @@
     </div>
   </el-col>
   <el-col :span="24 - setcol">
-    <addProduct :data="data" @onConfirm="onConfirm"></addProduct>
+    <el-drawer
+      title="添加商品"
+      :visible.sync="drawer"
+      append-to-body
+      direction="rtl"
+      size="80%">
+        <div class="drawer__panel">
+          <addProduct :drawer="drawer" :data="data" @onConfirm="onConfirm"></addProduct>
+        </div>
+    </el-drawer>
   </el-col>
 </el-row>
 </template>
@@ -171,6 +184,7 @@ export default {
   props:['data','type'],
   data () {
     return {
+      drawer:false,
       setcol:24,
       dataRefresh:true,
       tableData:[],
@@ -334,7 +348,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.setcol = 24
+        this.drawer = false
         this.listData()
         this.$emit('onSuccess')
       })

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -1,8 +1,12 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
+<<<<<<< HEAD
+    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
+=======
     <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
     <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
+>>>>>>> d8fdba3a2fd4ae678e15dee665c95eeaa4bd568b
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -157,7 +161,16 @@
     </div>
   </el-col>
   <el-col :span="24 - setcol">
-    <addProduct :data="data" @onConfirm="onConfirm"></addProduct>
+    <el-drawer
+      title="添加商品"
+      :visible.sync="drawer"
+      append-to-body
+      size="80%"
+      direction="rtl">
+        <div class="drawer__panel">
+          <addProduct :drawer="drawer" :data="data" @onConfirm="onConfirm"></addProduct>
+        </div>
+    </el-drawer>
   </el-col>
 </el-row>
 </template>
@@ -169,6 +182,7 @@ export default {
   props:['data','type'],
   data () {
     return {
+      drawer:false,
       setcol:24,
       dataRefresh:true,
       tableData:[],
@@ -328,7 +342,7 @@ export default {
         },
       })
       this.tool.showMessage(res,()=>{
-        this.setcol = 24
+        this.drawer = false
         this.listData()
         this.$emit('onSuccess')
       })

src/SDrpManagement/salerPrivatecustomer/detail/index.vue

@@ -188,7 +188,7 @@ export default {
     this.queryMainData(this.$route.query.id)
   },
   created() {
-    this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
+    // this.tool.checkAuth(this.$route.name,'update')?'':this.$router.go(-1)
   }
 }
 </script>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -7,6 +7,7 @@
       idName="sa_customersid"
       :apiId="{query:20221012164402,del:''}"
       :autoQuery="false"
+      :specialKey="[{key:'leader',value:'name'},{key:'tag_sys',value:null},{key:'industry',value:null}]"
       :detailPath="{path:'/customerDetail',param:{tabIndex:tabIndex}}"
       @listCreate="list">
       <template #custom>

src/SManagement/notice/index.vue

@@ -7,6 +7,7 @@
       idName="sat_noticeid" 
       :apiId="{query:20221111090904}"
       :options="options"
+      :drawerWidth="50"
       :detailPath="{
         path:'/notice_detail'
       }">

src/SManagement/orderclue/index.vue

@@ -7,8 +7,9 @@
         add:'SManagement/orderclue/components',
         edit:'SManagement/orderclue/components'
       }"
-      tableName="orderclueList" 
-      idName="sat_orderclueid" 
+      tableName="orderclueList"
+      idName="sat_orderclueid"
+      :specialKey="[{key:'leader',value:'name'}]"
       :apiId="{query:20221101094502,del:''}" 
       :options="options"
       :detailPath="{path:'/orderclue_detail',param:{tabIndex:tabIndex}}"

src/components/export_excel/index.vue

@@ -6,7 +6,7 @@
 
 <script>
 export default {
-  props:['tablecols','param','excelTitle','total'],
+  props:['tablecols','param','excelTitle','total','specialKey'],
   data () {
     return {}
   },
@@ -14,13 +14,21 @@ export default {
     async submit () {
       let data = {}
       // 如果传入了total,需要赋值保证数量准确性
+      // data = Object.assign({},data,this.param)
+      data = JSON.parse(JSON.stringify(this.param))
       if (this.total) {
-        this.param.content.pageSize = this.total
+        data.content.pageSize = this.total
       }
-      data = JSON.parse(JSON.stringify(this.param))
+      data.content.isAll = false
 
-      data.content.isAll = true
       const res = await this.$api.requested(data)
+
+      res.data.forEach(e=>{
+        this.specialKey.forEach(s=>{
+          e[s.key] = e[s.key]? e[s.key]:[]
+          e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+        })
+      })
       let table = JSON.parse(JSON.stringify(this.tablecols))
       table.forEach((e,index) => {
         // 由于表格数据结构问题这里需要判断一下

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -3,7 +3,7 @@
     :visible.sync="closeDrawerTemp"
     :with-header="false"
     direction="rtl"
-    size="90%"
+    :size="drawerWidth?drawerWidth+ '%' : 90 + '%'"
     append-to-body
     :before-close="closeDrawer">
     <div class="detail__panel">
@@ -16,6 +16,7 @@
 import  {mapGetters} from 'vuex'
 
 export default {
+  props:['drawerWidth'],
   computed:{
     ...mapGetters({
       closeDrawerTemp:'closeDrawerTemp',

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

@@ -22,7 +22,7 @@
                 <el-button :type="selection.length === 0?'':'primary'" :disabled="selection.length === 0" size="small" @click="deleteData">删 除</el-button>
               </el-button-group>
               <!-- <el-button class="inline-16" size="small" type="primary" plain>导 入</el-button> -->
-              <excel :tablecols="layout" :param="param" :total="total" :excelTitle="routerName"></excel>
+              <excel :tablecols="layout" :param="param" :total="total" :specialKey="specialKey" :excelTitle="routerName"></excel>
             </div>
             <slot name="titleRight"></slot>
           </div>
@@ -81,7 +81,7 @@
         </div>
       </div>
     </div>
-    <drawer @onSuccess="listData"></drawer>
+    <drawer :drawerWidth="drawerWidth" @onSuccess="listData"></drawer>
   </div>
 </template>
 
@@ -89,7 +89,7 @@
 import {mapGetters} from 'vuex'
 export default {
   componentName:'normalTable',
-  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination','hideSearch','statusHideDetailBtn'],
+  props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination','hideSearch','statusHideDetailBtn','specialKey','drawerWidth'],
   components:{
     tableTemp: () => import('./modules/table.vue'),
     setColumn: () => import('./modules/setColumn.vue'),

src/template/orderCanUseProduct/index.vue

@@ -59,8 +59,7 @@
       </el-table-column>
       <el-table-column
         prop="unit"
-        label="计量单位"
-        width="90">
+        label="计量单位">
         <template slot-scope="scope">
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}/{{scope.row.auxunit}}</el-tag>
         </template>
@@ -87,7 +86,7 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
-  props:['data'],
+  props:['data','drawer'],
   data () {
     return {
       params:{
@@ -159,6 +158,11 @@ export default {
   },
   mounted () {
     this.listData()
+  },
+  watch:{
+    drawer (val) {
+      val?this.listData():''
+    }
   }
 }