Merge branch 'mergeBranch' into greenUrgent

src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -135,11 +135,18 @@ export default {
   computed:{
   },
   watch:{
+    "data":function (val){
+      if(val){
+        this.listData()
+      }
+    }
   },
   created () {
-    if (this.$route.query.id) this.listData()
     this.tablecols = this.tool.tabelCol(this.$route.name).productBillnoTable.tablecols
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProuctProject.tablecols
+  },
+  mounted() {
+
   },
   methods: {
     async listData(){

src/HDrpManagement/contractManage/index.vue

@@ -166,6 +166,7 @@ export default {
       type:'',
       condition:'',
       status:'',
+      listqueryid:sessionStorage.getItem('listqueryid'),
       selectParam: {
         status: "",
         type: "",

src/HDrpManagement/contractManage/modules/detail.vue

@@ -310,10 +310,11 @@ export default {
       console.log(this.$refs.details.param.content,'param')
       // this.$refs.details.param.content.type = this.$route.query.tabIndex
       // this.$refs.details.param.content.where.type = this.$route.query.type
+      let listqueryid = sessionStorage.getItem('listqueryid')
       this.mainData.type == '项目'
         ? this.mainData.typemx == '直销'
-          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目',tabIndex:this.$route.query.tabIndex}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目',tabIndex:this.$route.query.tabIndex}})
-          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex}})
+          ? this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'直销项目',tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}}) : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:'经销项目',tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}})
+          : this.$router.replace({path:'/contractDetail',query:{id:this.$route.query.id,rowindex:this.$route.query.rowindex,type:this.mainData.type,tabIndex:this.$route.query.tabIndex,listqueryid:listqueryid,fieldname:'sa_contractid'}})
 
       this.changeDataStructure()
     },
@@ -1546,9 +1547,9 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
-      this.flag = false
+      /*this.flag = false
       tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/contractDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      this.$router.replace({path:'/contractDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})*/
       this.queryMainData(id)
     },
     onSuccess(){

src/HDrpManagement/customerData/components/pageTable.vue

@@ -51,6 +51,8 @@ export default {
       list:[],
       list2:[],
       total:0,
+      listqueryid:'',
+      pageTotal:0,
       options:[
       ],
     }
@@ -71,6 +73,9 @@ export default {
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total
+      this.listqueryid = res.listqueryid
+      this.pageTotal = res.pageTotal
+      sessionStorage.setItem('total',res.total)
       console.log(this.list)
     },
     handleSizeChange(val) {
@@ -101,4 +106,4 @@ export default {
   min-height: 100% !important;
   max-height: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/customerData/index.vue

@@ -269,7 +269,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerTypeTable',typeTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -399,7 +399,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerGradTable',gradTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -526,7 +526,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerContactTable',contactTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -653,7 +653,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerProjectTable',projectTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -780,7 +780,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerFllowTable',fllowTableParam,'sa_customersid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -981,7 +981,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_customersid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname === 'industry'">
                           <el-tag size="small" v-for="(item,index) in scope.data.data.industry" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
@@ -1415,13 +1415,19 @@ export default {
     }
   },
   methods:{
-    goDetail (data) {
+    goDetail (data,refData,paramData,fieldname) {
+      sessionStorage.setItem('listqueryid',this.$refs[refData].listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.push({
         path:'/customerDetail',
         query:{
           id:data.sa_customersid,
+          rowindex:data.rowindex,
+          listqueryid:this.$refs[refData].listqueryid,
+          fieldname:fieldname
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.$refs[refData].list2,param:paramData,pageTotal:this.$refs[refData].pageTotal})
       this.$store.dispatch('changeDetailDrawer',true)
     },
     //获取数据总览

src/HDrpManagement/invoicePredictionManage/details/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <newDetails ref="newDetails" :titleText="mainData.title" :mainAreaData="mainAreaData" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['订单','项目','客户']">
+    <newDetails ref="newDetails" :titleText="mainData.title" :mainAreaData="mainAreaData" :pageChange="true" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['订单','项目','客户']" @pageChange="queryMainData">
       <template #bottomLeft>
         <div>
           <div style="display: flex;justify-content: space-between;">

src/HDrpManagement/invoicePredictionManage/modules/detailInfo.vue

@@ -8,9 +8,17 @@
 export default {
   name: "edit",
   props:["data"],
+  data(){
+    return {
+      listqueryid:''
+    }
+  },
   methods:{
     onShow(){
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      /*sessionStorage.setItem('isGo','1')*/
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/invoiceManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
     },

src/HDrpManagement/invoicePredictionManage/modules/edit.vue

@@ -8,9 +8,16 @@
 export default {
   name: "edit",
   props:["data"],
+  data(){
+    return {
+      listqueryid:''
+    }
+  },
   methods:{
     onShow(){
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/invoiceManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
     },

src/HDrpManagement/orderManage/details/index.vue

@@ -371,7 +371,7 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
-      this.$router.replace({path:'/orderdetail',query:{id:id,rowindex:rowindex}})
+      /*this.$router.replace({path:'/orderdetail',query:{id:id,rowindex:rowindex}})*/
       this.queryMainData(id)
     },
     // 查询站点是否使用返利金

src/HDrpManagement/orderManage/index.vue

@@ -79,6 +79,13 @@
             <el-option label="已变更" value="1"></el-option>
           </el-select>
         </div>
+        <div class="mt-10" v-if="siteid == 'TZ' || siteid == 'NB'">
+          <p class="search__label">逾期情况:</p>
+          <el-select v-model="where.isoverdue" clearable style="margin-right:10px" size="small" placeholder="请选择逾期情况" @change="change">
+            <el-option label="逾期未通过" value="0"></el-option>
+            <el-option label="逾期已通过" value="1"></el-option>
+          </el-select>
+        </div>
         <div class="mt-10">
           <label class="search__label" >审核日期:</label>
           <el-date-picker
@@ -139,6 +146,7 @@ export default {
     return {
       options:[],
       tradefieldList:'',
+      "siteid":JSON.parse(sessionStorage.getItem('active_account')).siteid,
       where: {
         "condition":"",
         "status" : '',
@@ -148,7 +156,9 @@ export default {
         "invoicestatus":'',
         "isreturn": '',
         "ischange": '',
-        "saler_name":''
+        "saler_name":'',
+        "isoverdue":'',
+        "siteid":''
       },
       dateSelect:[]
 

src/HDrpManagement/projectChange/modules/detail.vue

@@ -334,7 +334,7 @@ export default {
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.flag = 0
-      this.$router.replace({path:'/projectChangeDetail',query:{id:id,rowindex:rowindex,portrait:''}})
+     /* this.$router.replace({path:'/projectChangeDetail',query:{id:id,rowindex:rowindex,portrait:''}})*/
       this.queryMainData(id)
     },
     /*BPM是否开启*/

src/HDrpManagement/projectChange/modules/modules/contract/index.vue

@@ -76,6 +76,8 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      pageTotal:0,
+      listqueryid:'',
       params:{
         "id": 20221223102102,
         "content": {
@@ -100,7 +102,9 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -137,8 +141,19 @@ export default {
               this.oldRoute = {path:route.path,query:route.query}
               this.$store.dispatch('setHistoryRouter',this.oldRoute)
             }
+            /*let listqueryid = sessionStorage.getItem('listqueryid')*/
             sessionStorage.setItem('active_modules',JSON.stringify(item2))
-            this.$router.push({path:'/contractDetail',query:{id:data.sa_contractid,type:type}})
+            sessionStorage.setItem('listqueryid',this.listqueryid)
+            sessionStorage.setItem('isGo','1')
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:data.sa_contractid,
+                rowindex:data.rowindex,
+                listqueryid:this.listqueryid,
+                type:type,
+                fieldname:'sa_contractid'
+              }})
+            this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
             return
           }
         })

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

@@ -62,6 +62,8 @@ export default {
       total:0,
       currentPage:0,
       search:'',
+      listqueryid:'',
+      pageTotal:0,
       params:{
         "id": 20221124190702,
         "content": {
@@ -107,13 +109,18 @@ export default {
         this.oldRoute = {path:route.path,query:route.query}
         this.$store.dispatch('setHistoryRouter',this.oldRoute)
       }
+      sessionStorage.setItem('listqueryid',this.listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.push({
         path:'/quotedPriceDetail',
         query:{
           id:row.sa_quotedpriceid,
-          rowindex:row.rowindex
+          rowindex:row.rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sa_quotedpriceid'
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
     },
     async submit (data) {
       let res = await this.$api.requested({
@@ -159,6 +166,8 @@ export default {
         /*this.list[index].begdate = new Date(e.begdate).getFullYear() +*/
       })
       this.total = res.total
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
 
     },
     handleSizeChange(val) {
@@ -172,7 +181,6 @@ export default {
       this.listData()
     },
     clearData(){
-
       this.search = ""
       this.params.content.where.condition = this.search
       this.listData()

src/HDrpManagement/projectData/components/pageTable.vue

@@ -25,6 +25,7 @@
             </div>
           </div>
         </template>
+
       </tableLayout>
     </div>
     <div style="margin-top:16px;text-align:right">
@@ -51,6 +52,8 @@ export default {
       list:[],
       list2:[],
       total:0,
+      listqueryid:'',
+      pageTotal:0,
       options:[
       ],
     }
@@ -71,7 +74,9 @@ export default {
       this.list = res.data
       this.list2 = res.data.length && res.data[0].isEmpty ? [] : res.data
       this.total = res.data.length && res.data[0].isEmpty ? 0 : res.total
-      console.log(this.list)
+      this.listqueryid = res.listqueryid
+      this.pageTotal = res.pageTotal
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -101,4 +106,4 @@ export default {
   min-height: 100% !important;
   max-height: 100% !important;
 }
-</style>
+</style>

src/HDrpManagement/projectData/index.vue

@@ -225,7 +225,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'typeTable',typeTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -363,7 +363,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'gradTable',gradTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -495,7 +495,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'scoreTable',scoreTableParam1,'sa_projectid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -877,7 +877,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectFllowTable',fllowTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1015,7 +1015,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectContactTable',contactTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1153,7 +1153,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectCustomerTable',customerTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1291,7 +1291,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)" :disabled="isFull">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'projectScoreTable',scoreTableParam,'sa_projectid')" :disabled="isFull">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -1420,7 +1420,7 @@
                           <el-tag size="small" v-for="(item,index) in scope.data.data.sys_tag" :key="index" style="margin-right: 5px">{{ item }}</el-tag>
                         </div>
                         <div v-else-if="scope.data.columnname == 'operation'">
-                          <el-button type="text" size="small" @click="goDetail(scope.data.data)">详情</el-button>
+                          <el-button type="text" size="small" @click="goDetail(scope.data.data,'customerUnfllowTable',unfllowTableParam,'sa_projectid')">详情</el-button>
                         </div>
                         <div v-else-if="scope.data.columnname == 'signamount_due'">
                           {{ tool.formatAmount(scope.data.data.signamount_due,2,'￥') }}
@@ -2037,13 +2037,19 @@ export default {
     }
   },
   methods:{
-    goDetail (data) {
+    goDetail (data,refData,paramData,fieldname) {
+      sessionStorage.setItem('listqueryid',this.$refs[refData].listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.push({
         path:'/projectChangeDetail',
         query:{
           id:data.sa_projectid,
+          rowindex:data.rowindex,
+          listqueryid:this.$refs[refData].listqueryid,
+          fieldname:fieldname
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.$refs[refData].list2,param:paramData,pageTotal:this.$refs[refData].pageTotal})
       this.$store.dispatch('changeDetailDrawer',true)
     },
     //获取数据总览

src/HDrpManagement/projectPredictionManage/details/index.vue

@@ -1,6 +1,6 @@
 <template>
  <div>
-   <newDetails :titleText="mainData.title" :mainAreaData="mainAreaData" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['项目产品清单']" >
+   <newDetails :titleText="mainData.title" :mainAreaData="mainAreaData" :pageChange="true" idname="sa_salesforecastbillid" :editData="mainData" :tabs="['项目产品清单']" @pageChange="queryMainData">
      <template #bottomLeft>
        <div style="height:  calc(100vh - 180px)">
          <div style="display: flex;justify-content: space-between;">

src/HDrpManagement/projectPredictionManage/modules/detailInfo.vue

@@ -12,13 +12,16 @@ export default {
     return {
       drawer:false,
       mainAreaData:'',
-      mainData:""
+      mainData:"",
+      listqueryid:''
     }
   },
   methods:{
     onShow(){
       this.drawer = true
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,isDetail:1,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/projectManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
       /*this.queryMainData()*/

src/HDrpManagement/projectPredictionManage/modules/edit.vue

@@ -12,13 +12,16 @@ export default {
     return {
       drawer:false,
       mainAreaData:'',
-      mainData:""
+      mainData:"",
+      listqueryid:''
     }
   },
   methods:{
     onShow(){
       this.drawer = true
-      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex}
+      this.listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data.sa_salesforecastbillid,rowindex:this.data.rowindex,listqueryid:this.listqueryid,
+        fieldname:'sa_salesforecastbillid'}
       this.$router.push({path:'/projectManageDetail',query:query})
       this.$store.dispatch('changeDetailDrawer',true)
       /*this.queryMainData()*/

src/SDrpManagement/QuotedPrice/detail/index.vue

@@ -238,7 +238,12 @@ export default {
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex) {
       this.flag = false
-      this.$router.replace({path:'/quotedPriceDetail',query:{id:id,rowindex:rowindex}})
+     /* this.$router.replace({path:'/quotedPriceDetail',
+        query:{
+          id:id,rowindex:rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sa_quotedpriceid'
+        }})*/
       this.queryMainData(id)
     },
     changeDataStructure(){
@@ -255,7 +260,7 @@ export default {
         },
         {
           label:'负责人',
-          value:this.mainData.leader?this.mainData.leader[0].name:'--'
+          value:this.mainData.leader?this.mainData.leader[0]?this.mainData.leader[0].name:'--':'--'
         },
         {
           label:'报价日期',
@@ -346,7 +351,7 @@ export default {
             },
             {
               label:'负责人',
-              value:this.mainData.leader?this.mainData.leader[0].name:'--'
+              value:this.mainData.leader?this.mainData.leader[0]?this.mainData.leader[0].name:'--':'--'
             },
             {
               label:'手机号',

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -348,9 +348,10 @@ export default {
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
+      console.log('翻页')
       this.flag = false
-      tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex,portrait:''}})
+   /*   tabIndex = this.$route.query.tabIndex*/
+     /* this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex,portrait:''}})*/
       this.queryMainData(id)
     },
     onSuccess(){

src/SDrpManagement/salerPrivatecustomer/detail/modules/contract/index.vue

@@ -62,6 +62,8 @@ export default {
       list:[],
       total:0,
       currentPage:0,
+      pageTotal:0,
+      listqueryid:'',
       params:{
         "content": {
           "sys_enterpriseid": '',
@@ -101,6 +103,9 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -127,7 +132,17 @@ export default {
               this.$store.dispatch('setHistoryRouter',this.oldRoute)
             }
             sessionStorage.setItem('active_modules',JSON.stringify(item2))
-            this.$router.push({path:'/contractDetail',query:{id:data.sa_contractid,type:type}})
+            sessionStorage.setItem('listqueryid',this.listqueryid)
+            sessionStorage.setItem('isGo','1')
+            this.$router.push({path:'/contractDetail',
+              query:{
+                id:data.sa_contractid,
+                type:type,
+                rowindex:data.rowindex,
+                listqueryid:this.listqueryid,
+                fieldname:'sa_contractid'
+              }})
+            this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
             return
           }
         })
@@ -148,4 +163,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/detail/modules/followLeads/index.vue

@@ -64,6 +64,8 @@ export default {
       total: 0,
       currentPage: 0,
       search:'',
+      pageTotal:0,
+      listqueryid:'',
       param: {
         "id": 20221208163302,
         "content": {
@@ -84,6 +86,9 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -108,13 +113,19 @@ export default {
         this.oldRoute = {path:route.path,query:route.query}
         this.$store.dispatch('setHistoryRouter',this.oldRoute)
       }
+      sessionStorage.setItem('listqueryid',this.listqueryid)
+      sessionStorage.setItem('isGo','1')
       this.$router.replace({
         path:'/orderclue_detail',
         query:{
           id:row.sat_orderclueid,
-          rowindex:row.rowindex
+          rowindex:row.rowindex,
+          listqueryid:this.listqueryid,
+          fieldname:'sat_orderclueid'
         }
       })
+      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:this.pageTotal})
+
     }
 
   },

src/SDrpManagement/salerPrivatecustomer/detail/modules/quotedPrice/list.vue

@@ -57,6 +57,8 @@ export default {
       total:0,
       currentPage:0,
       search:"",
+      pageTotal:0,
+      listqueryid:'',
       param:{
         "id": "20221018102103",
         "content": {
@@ -79,24 +81,31 @@ export default {
           this.oldRoute = {path:route.path,query:route.query}
           this.$store.dispatch('setHistoryRouter',this.oldRoute)
         }
+        sessionStorage.setItem('listqueryid',this.listqueryid)
+        sessionStorage.setItem('isGo','1')
         this.$router.replace({
           path:'/quotedPriceDetail',
           query:{
             id:row.sa_quotedpriceid,
-            rowindex:row.rowindex
+            rowindex:row.rowindex,
+            listqueryid:this.listqueryid,
+            fieldname:'sa_quotedpriceid'
           }
         })
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
         this.$store.dispatch('changeDetailDrawer',true)
       },500)
 
     },
     async listData(){
-      console.log(this.data)
       this.param.content.sys_enterpriseid = this.data.sys_enterpriseid
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.pageTotal = res.pageTotal
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -134,4 +143,4 @@ export default {
   display: flex;
   align-items: center;
 }
-</style>
+</style>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-      <basicLayout
+    <basicLayout
       ref="list"
       formPath="salerPrivatecustomer"
       tableName="salerPrivatecustomerTable"

src/SDrpManagement/shopCart/modules/list.vue

@@ -12,92 +12,60 @@
     </div>
   </div>
   <div class="produtMag-panel">
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      style="width: 100%;"
-      height="calc(100vh - 325px)"
-      :header-cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
-      :cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
-      @selection-change="selectionChange">
-      <el-table-column
-        type="selection"
-        width="55"
-        align="center">
-      </el-table-column>
-      <el-table-column
-        v-if="params.content.istool == 0"
-        prop="tradefield_shoppingcart"
-        label="品牌/领域"
-        width="250">
-        <template slot-scope="scope">
-          <el-tag size="mini" type="primary" effect="dark">{{scope.row.brandname}}</el-tag>&nbsp;
-          <el-tag size="mini" type="primary" effect="dark">{{scope.row.tradefield_shoppingcart}}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-        label="产品名称"
-        width="150">
-      </el-table-column>
-      <el-table-column
-        prop="itemno"
-        label="产品编号"
-        width="150">
-      </el-table-column>
-      <el-table-column
-          label="型号">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model.length >10?scope.row.model.substring(0,9) + '...':scope.row.model}}</span></p>
-        </template>
-      </el-table-column>
-      <el-table-column
-          label="规格">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.spec.length >10?scope.row.spec.substring(0,9) + '...':scope.row.spec}}</span></p>
-        </template>
-      </el-table-column>
-<!--      <el-table-column
-        label="型号/规格">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
-        </template>
-      </el-table-column>-->
-      <el-table-column
-        prop="oldprice"
-        label="单价"
-        width="90">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="数量"
-        width="150">
-        <template slot-scope="scope">
-        <el-input-number size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" @change="changeQty(scope.$index,scope.row)" :step="scope.row.orderaddqty" label="输入数量"></el-input-number>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="计量单位"
-        width="80">
-        <template slot-scope="scope">
-          <el-tag>{{ scope.row.unitname }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column
-        label="金额"
-        width="80">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice * scope.row.qty,2)}}</p>
-        </template>
-      </el-table-column>
-      <el-table-column width="90" label="操作">
-        <template slot-scope="scope">
-          <slot name="del" :data="scope.row"></slot>
-        </template>
-      </el-table-column>
-    </el-table>
+    <tableMainLayout v-show="params.content.istool == '0'" :layout="tableColsProduct" :data="tableData" height="calc(100vh - 325px)" fixedName="operation" :width="true" :custom="true" :isCheck="true" @checkboxCallBack="selectionChange">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'adefieldShoppingcart'">
+          <el-tag size="mini" type="primary" effect="dark">{{scope.column.data.brandname}}</el-tag>&nbsp;
+          <el-tag size="mini" type="primary" effect="dark">{{scope.column.data.tradefield_shoppingcart}}</el-tag>
+        </div>
+        <div v-else-if="scope.column.columnname === 'model'">
+          <p><span>{{scope.column.data.model.length >10?scope.column.data.model.substring(0,9) + '...':scope.column.data.model}}</span></p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'spec'">
+          <p><span>{{scope.column.data.spec.length >10?scope.column.data.spec.substring(0,9) + '...':scope.column.data.spec}}</span></p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'oldprice'">
+          <span><small>¥</small>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'qty'">
+          <el-input-number size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" @change="changeQty(scope.column.data.$index,scope.column.data)" :step="scope.column.data.orderaddqty" label="输入数量"></el-input-number>
+        </div>
+        <div v-else-if="scope.column.columnname === 'amount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.oldprice * scope.column.data.qty,2)}}</p>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname === 'operation'?scope.column.data[scope.column.columnname]:'--'}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <slot name="del" :data="scope.data"></slot>
+      </template>
+    </tableMainLayout>
+    <tableMainLayout v-show="params.content.istool == '1'" :layout="tableColsTool" :data="tableData" height="calc(100vh - 325px)" fixedName="operation" :width="true" :custom="true" :isCheck="true" @checkboxCallBack="selectionChange">
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'adefieldShoppingcart'">
+          <el-tag size="mini" type="primary" effect="dark">{{scope.column.data.brandname}}</el-tag>&nbsp;
+          <el-tag size="mini" type="primary" effect="dark">{{scope.column.data.tradefield_shoppingcart}}</el-tag>
+        </div>
+        <div v-else-if="scope.column.columnname === 'model'">
+          <p><span>{{scope.column.data.model.length >10?scope.column.data.model.substring(0,9) + '...':scope.column.data.model}}</span></p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'spec'">
+          <p><span>{{scope.column.data.spec.length >10?scope.column.data.spec.substring(0,9) + '...':scope.column.data.spec}}</span></p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'oldprice'">
+          <span><small>¥</small>{{tool.formatAmount(scope.column.data[scope.column.columnname],2)}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'qty'">
+          <el-input-number size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" @change="changeQty(scope.column.data.$index,scope.column.data)" :step="scope.column.data.orderaddqty" label="输入数量"></el-input-number>
+        </div>
+        <div v-else-if="scope.column.columnname === 'amount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.oldprice * scope.column.data.qty,2)}}</p>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname] || scope.column.columnname === 'operation'?scope.column.data[scope.column.columnname]:'--'}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <slot name="del" :data="scope.data"></slot>
+      </template>
+    </tableMainLayout>
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
@@ -136,7 +104,10 @@ export default {
       tableData: [],
       total:0,
       currentPage:0,
-      layout:[]
+      layout:[],
+      tableCols:[],
+      tableColsProduct:[],
+      tableColsTool:[]
     }
   },
   components:{
@@ -183,6 +154,11 @@ export default {
     },
     onRadioChange () {
       this.params.content.pageNumber = 1
+      if (this.params.content.istool == 0){
+        this.tableCols = this.tool.tabelCol(this.$route.name).productsTable.tablecols
+      }else {
+        this.tableCols = this.tool.tabelCol(this.$route.name).toolsTable.tablecols
+      }
       this.listData()
       this.$emit('onRadioChange',this.params.content.istool)
     },
@@ -227,6 +203,9 @@ export default {
   mounted () {
     this.listData()
     this.layout = this.tool.tabelCol(this.$route.name).exportTable.tablecols
+    this.tableCols = this.tool.tabelCol(this.$route.name).productsTable.tablecols
+    this.tableColsProduct = this.tool.tabelCol(this.$route.name).productsTable.tablecols
+    this.tableColsTool = this.tool.tabelCol(this.$route.name).toolsTable.tablecols
   }
 }
 

src/SDrpManagement/shopCart/modules/listCopy.vue

@@ -0,0 +1,250 @@
+<template>
+<div class="container normal-panel">
+  <div class="normal-margin">
+    <!-- <slot name="operation"></slot> -->
+    <div class="flex-align-center">
+      <el-radio-group class="inline-16" size="small" v-model="params.content.istool" @change="onRadioChange">
+        <el-radio-button :label="0">产品</el-radio-button>
+        <el-radio-button :label="1">工具</el-radio-button>
+      </el-radio-group>
+      <el-input style="width:300px" size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+      <ExportBtn v-if="tool.checkAuth($route.name,'export')" :tablecols="layout" :param="params" :total="total" excelTitle="购物车"></ExportBtn>
+    </div>
+  </div>
+  <div class="produtMag-panel">
+    <el-table
+      ref="multipleTable"
+      :data="tableData"
+      style="width: 100%;"
+      height="calc(100vh - 325px)"
+      :header-cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
+      :cell-style="{height:'50px',color:'#768093',fontWeight:'400'}"
+      @selection-change="selectionChange">
+      <el-table-column
+        type="selection"
+        width="55"
+        align="center">
+      </el-table-column>
+      <el-table-column
+        v-if="params.content.istool == 0"
+        prop="tradefield_shoppingcart"
+        label="品牌/领域"
+        width="250">
+        <template slot-scope="scope">
+          <el-tag size="mini" type="primary" effect="dark">{{scope.row.brandname}}</el-tag>&nbsp;
+          <el-tag size="mini" type="primary" effect="dark">{{scope.row.tradefield_shoppingcart}}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="产品名称"
+        width="150">
+      </el-table-column>
+      <el-table-column
+        prop="itemno"
+        label="产品编号"
+        width="150">
+      </el-table-column>
+      <el-table-column
+          label="型号">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.model.length >10?scope.row.model.substring(0,9) + '...':scope.row.model}}</span></p>
+        </template>
+      </el-table-column>
+      <el-table-column
+          label="规格">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.spec.length >10?scope.row.spec.substring(0,9) + '...':scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>
+<!--      <el-table-column
+        label="型号/规格">
+        <template slot-scope="scope">
+          <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
+        </template>
+      </el-table-column>-->
+      <el-table-column
+        prop="oldprice"
+        label="单价"
+        width="90">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice,2)}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="数量"
+        width="150">
+        <template slot-scope="scope">
+        <el-input-number size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" @change="changeQty(scope.$index,scope.row)" :step="scope.row.orderaddqty" label="输入数量"></el-input-number>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="计量单位"
+        width="80">
+        <template slot-scope="scope">
+          <el-tag>{{ scope.row.unitname }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="金额"
+        width="80">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.oldprice * scope.row.qty,2)}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column width="90" label="操作">
+        <template slot-scope="scope">
+          <slot name="del" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+        background
+        small
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-size="params.content.pageSize"
+        layout="total, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</div>
+</template>
+
+<script>
+import previewImage from '@/components/previewImage/index'
+import ExportBtn from './exportBtn'
+
+export default {
+  data () {
+    return {
+      params:{
+        "id": 20220924095302,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 9999,
+          "istool":0,
+          "where": {
+            "condition": ''
+          }
+        }
+      },
+      tableSelectData:[],
+      tableData: [],
+      total:0,
+      currentPage:0,
+      layout:[]
+    }
+  },
+  components:{
+    previewImage,
+    ExportBtn
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.params)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(res.data);
+
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    selectionChange (val) {
+      this.tableSelectData = val
+      if (this.params.content.istool == 0) {
+         let _isbrandSame = this.tableSelectData.some(item=>item.sa_brandid !== this.tableSelectData[0].sa_brandid)
+
+        if (_isbrandSame) return this.$message({message:"当前存在不同品牌产品请检查",type:'error'})
+
+        let _isFieldSame = this.tableSelectData.some(item=>item.tradefield_shoppingcart !== this.tableSelectData[0].tradefield_shoppingcart)
+
+        if (_isFieldSame) return this.$message({message:"当前存在不同领域产品请检查",type:'error'})
+
+        this.$emit('selection',val)
+      } else {
+        this.$emit('selection',val)
+      }
+    },
+    clearSelection () {
+      this.$refs.multipleTable.clearSelection();
+    },
+    onRadioChange () {
+      this.params.content.pageNumber = 1
+      this.listData()
+      this.$emit('onRadioChange',this.params.content.istool)
+    },
+    async changeQty (index,row) {
+      if (row.qty < row.orderminqty){
+        row.qty = row.orderminqty
+        const res = await this.$api.requested({
+          "id": 20220924104302,
+          "content": {
+            "sa_shoppingcartid": row.sa_shoppingcartid,
+            "qty": row.qty //数量
+          },
+        })
+        this.$emit('qtyChange')
+      }else {
+        if ((row.qty - row.orderminqty)/row.orderaddqty > 0){
+          let k = Math.ceil((row.qty - row.orderminqty)/row.orderaddqty)
+          row.qty = k * row.orderaddqty + row.orderminqty
+          const res = await this.$api.requested({
+            "id": 20220924104302,
+            "content": {
+              "sa_shoppingcartid": row.sa_shoppingcartid,
+              "qty": row.qty //数量
+            },
+          })
+          this.$set(this.tableData,index,row)
+          this.$emit('qtyChange')
+        }else {
+          const res = await this.$api.requested({
+            "id": 20220924104302,
+            "content": {
+              "sa_shoppingcartid": row.sa_shoppingcartid,
+              "qty": row.qty //数量
+            },
+          })
+          this.$emit('qtyChange')
+        }
+      }
+
+    }
+  },
+  mounted () {
+    this.listData()
+    this.layout = this.tool.tabelCol(this.$route.name).exportTable.tablecols
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.produtMag-panel{
+  /* margin: 30px; */
+  padding:0 10px 10px 10px;
+  background: #fff;
+  border-radius:5px;
+  overflow: hidden;
+  border:1px solid rgb(0 0 0 / 5%)
+  /* box-shadow: 0 5px 5px rgb(0 0 0 / 10%);
+  transform: translate3d(0,-2px,0); */
+}
+.image {
+  width:40px;height:40px;margin:0px auto;
+}
+</style>

src/components/attachment_list/index.vue

@@ -35,7 +35,7 @@
       </el-table-column>
       <el-table-column
         label="操作"
-        width="140">
+        width="170">
         <template slot-scope="scope">
           <div v-if="actid === scope.row.attachmentid">
             <el-button type="text" size="small" @click="saveEdit(scope.row)" :disabled="status === '已失败' || status === '已结案'">保 存</el-button>
@@ -43,6 +43,7 @@
           </div>
           <div v-else>
             <el-button type="text" size="small" @click="download(scope.row)" :disabled="status === '已失败' || status === '已结案'">下 载</el-button>
+            <el-button type="text" size="small" @click="seeClick(scope.row)" >预 览</el-button>
             <el-button :disabled="onlyread || status === '已失败' || status === '已结案' " class="inline-16" type="text" size="small" @click="editAttachment(scope.row)" >编 辑</el-button>
             <el-popconfirm
               title="确定删除当前附件吗？"
@@ -53,17 +54,22 @@
         </template>
       </el-table-column>
     </el-table>
+    <SeeFile ref="seeFile" :fileData="seeFile"></SeeFile>
   </div>
 </template>
 
 <script>
+import SeeFile from '@/components/file-block/components/SeeFile1'
 export default {
   props:['attinfos','onlyread','status'],
   data () {
     return {
       actid:null,
+      seeFile: '',
+      isSeeFileShow:false
     }
   },
+  components:{SeeFile},
   methods:{
     refresh () {
       this.$emit('cancelEdit')
@@ -114,7 +120,24 @@ export default {
       })
       res.code === 1?this.tool.showMessage(res):''
       res.code === 1?this.$emit('onSuccess'):''
-    }
+    },
+    seeClick(item) {
+      console.log(item)
+      if(item.postfix == 'png' || item.postfix == 'PNG' || item.postfix == 'jpg' || item.postfix == 'JPG' || item.postfix == 'bmp' || item.postfix == 'BMP'
+          || item.postfix == 'gif' || item.postfix == 'GIG' || item.postfix == 'WEBP' || item.postfix == 'webp' || item.postfix == 'svg' || item.postfix == 'SVG'
+          || item.postfix == 'TIFF' || item.postfix == 'tiff' || item.postfix == 'MP4' || item.postfix == 'mp4' || item.postfix == 'ogg' || item.postfix == 'webm') {
+        this.seeFile = item
+        this.$refs.seeFile.dialogVisible = true
+      } else if (item.postfix == 'PDF' || item.postfix == 'pdf'){
+        window.open(item.url,'_blank')
+      }else {
+        this.$notify({
+          title:'提示',
+          message:'该文件暂不支持',
+          type:'warning'
+        })
+      }
+    },
   }
 }
 

src/components/newDetailTemp/index.vue

@@ -9,6 +9,10 @@
           <div>
             <slot name="customOperation"></slot>
           </div>
+          <div v-if="pageChange === true">
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
+            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right" ></i></el-button>
+          </div>
         </div>
       </div>
       <div>
@@ -47,12 +51,15 @@ import {mapGetters} from "vuex";
 import tabTemp from '@/components/normal-basic-layout/details/modules/tabs/tab'
 export default {
   name: "index",
-  props:["titleText","mainAreaData",'tabs','editData','idname','ownertable'],
+  props:["titleText","mainAreaData",'tabs','editData','idname','ownertable','pageChange'],
   components:{tabTemp},
   data(){
     return {
       screenWidth: 0, // 存储当前屏幕的宽度
       multipleSize: 0, // 根据屏幕宽度计算得出的值
+      turnTotal:sessionStorage.getItem('total'),
+      refreshPage:true,
+      time:null
     }
   },
   methods:{
@@ -62,7 +69,158 @@ export default {
     handleResize() {
       // 更新屏幕宽度
       this.screenWidth = window.innerWidth;
-    }
+    },
+    async next () {
+      console.log('1111111111111')
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.nextOld()
+      }else {
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (this.time !== null) {
+          clearTimeout(this.time)
+        }
+        this.time = setTimeout(() => {
+          this.upPageData(1,listqueryid)
+        }, 0);
+      }
+
+    },
+    async previous () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.previousOld()
+      }else {
+        let rowindex = this.$route.query.rowindex
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (rowindex >= 1) {
+          if (rowindex = 1){
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = true
+          }else {
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = false
+          }
+        } else {
+          /*message.warn('已经是第一条了!')*/
+          this.isPrevious = true
+        }
+      }
+
+    },
+    async nextOld () {
+      const rs = await this.checkPaginationData()
+
+      if (rs == 0 && this.svlistData.listData.length == 1) return false
+      if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
+      let fun = (rs) =>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+        if (rs == 1) {
+          changeId = this.svlistData.listData[0][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index + 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (rs == 1) {
+        this.svlistData.param.content.pageNumber ++
+        this.nextData(this.svlistData.param,(rs)=>{
+          fun(1)
+        })
+      } else {
+        fun()
+      }
+    },
+    async previousOld () {
+      const res = await this.checkPaginationData()
+      if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
+      const fun = (rs)=>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+
+        if (rs == 0) {
+          changeId = this.svlistData.listData[this.svlistData.listData.length - 1][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index - 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (res == 0) {
+        this.svlistData.param.content.pageNumber --
+        this.nextData(this.svlistData.param,()=>{
+          fun(0)
+        })
+      } else {
+        fun()
+      }
+    },
+    async upPageData (forward,listqueryid){
+      /*const hide = message.loading({content:'正在查询数据,请稍等..',duration:0,key:1});*/
+      const res = await this.$api.requested({
+        "classname": "system.tools",
+        "method":"querylistdatabyrowindex",
+        "content": {
+          "uniqueid":this.$route.query.id,
+          "rowindex": this.$route.query.rowindex,
+          "forward":forward,
+          "listqueryid": listqueryid,
+          "fieldname":this.$route.query.fieldname
+        }
+      })
+      console.log('执行了嘛')
+      if (res.data.data) {
+        console.log('data执行')
+        this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
+        this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
+      } else {
+        console.log("没有执行")
+        /* message.warn('已经是最后一条了!')*/
+      }
+    },
+    checkPaginationData () {
+      return new Promise((reslove,reject)=>{
+        let id = this.$route.query.id
+        let n = 0
+        this.svlistData.listData.filter((e,index)=>{
+          if (e[this.idname] == id){
+
+            n = index
+          }
+        })
+        if (n == 0) {
+          reslove(0)
+        } else if (n == this.svlistData.listData.length - 1) {
+          reslove(1)
+        } else {
+          reslove(-1)
+        }
+      })
+    },
+    refresh () {
+      this.refreshPage = false
+      setTimeout(() => {
+        this.refreshPage = true
+      }, 10);
+    },
   },
   mounted() {
     // 监听窗口大小变化
@@ -104,6 +262,7 @@ export default {
       }
 
     },
+
     ...mapGetters({
       activeApp:"activeApp",
       svlistData:'svlistData'

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

@@ -20,8 +20,8 @@
           </div>
           <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
          <div v-if="!pageChange">
-            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
-            <el-button size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
+            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right"></i></el-button>
           </div>
         </div>
       </div>
@@ -121,6 +121,7 @@ export default {
       refreshPage:true,
       reportCenterLsit:[],
       systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+      turnTotal:sessionStorage.getItem('total'),
     }
   },
   computed:{
@@ -207,6 +208,20 @@ export default {
       })
     },
     async next () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.nextOld()
+      }else {
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (this.time !== null) {
+          clearTimeout(this.time)
+        }
+        this.time = setTimeout(() => {
+          this.upPageData(1,listqueryid)
+        }, 0);
+      }
+
+    },
+    async nextOld () {
       const rs = await this.checkPaginationData()
       if (rs == 0 && this.svlistData.listData.length == 1) return false
       if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
@@ -235,6 +250,37 @@ export default {
       }
     },
     async previous () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.previousOld()
+      }else {
+        let rowindex = this.$route.query.rowindex
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (rowindex >= 1) {
+          if (rowindex = 1){
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = true
+          }else {
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = false
+          }
+        } else {
+          /*message.warn('已经是第一条了!')*/
+          this.isPrevious = true
+        }
+      }
+
+    },
+    async previousOld () {
       const res = await this.checkPaginationData()
       if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
       const fun = (rs)=>{

src/components/normal-basic-layout-new/details/modules/followUp/followUp.vue

@@ -1,17 +1,20 @@
 <template>
-  <div class="normal-panel follow__panel" >
+  <div class="normal-panel follow__panel" id="containerFull">
     <div class="container flex-align-center flex-between">
       <div>
         <slot name="collapse"></slot>
         <p class="inline-16">跟进动态</p>
       </div>
-      <addLog :ownertable="ownertable" :ownerid="owneridNew" @onSuccess="queryLogs" :status="status"></addLog>
+      <div style="display: flex;justify-content: space-between">
+        <fullScreen class="inline-16" domId="containerFull" @onFull="onFull" @backFull="backFull"></fullScreen>
+        <addLog :ownertable="ownertable" :ownerid="owneridNew" @onSuccess="queryLogs" :status="status"></addLog>
+      </div>
     </div>
     <div  class="container" >
       <div v-if="logList.length === 0">
         <el-empty description="暂无记录" :image-size="40"></el-empty>
       </div>
-      <div>
+      <div :style="{overflow: isFull?'auto':'none',height:isFull?(windowHeight - 100) + 'px':''}">
         <el-timeline>
           <el-timeline-item
             v-for="i in logList" :key="i.index"
@@ -132,7 +135,7 @@
 <script>
 import upload from '@/components/upload/hw_obs_upload.vue'
 import previewImage from '@/components/previewImage/index.vue'
-
+import fullScreen from "@/views/salesData/components/fullScreen";
 import addLog from './addLog.vue'
 import editLog from './editLog.vue'
 export default {
@@ -141,7 +144,8 @@ export default {
     addLog,
     editLog,
     upload,
-    previewImage
+    previewImage,
+    fullScreen
   },
   data () {
     return {
@@ -149,7 +153,9 @@ export default {
       logList:[],
       nowUserid:'',
       ownertableNew:'',
-      owneridNew:''
+      owneridNew:'',
+      isFull:false,
+      windowHeight: window.innerHeight,  //实时屏幕高度
     }
   },
   methods:{
@@ -211,15 +217,39 @@ export default {
       this.tool.showMessage(res,()=>{
         this.queryLogs()
       })
+    },
+    /*全屏*/
+    onFull(){
+      this.heightChart = this.windowWidth > 1128 ? 'calc(100vh - 85px)':'calc(100vh - 115px)'
+      this.isFull = true
+    },
+    /*退出全屏*/
+    backFull(val){
+      this.heightChart = '100%'
+      this.isFull = false
+      this.$emit('backFull',val)
     }
   },
   mounted () {
    /* this.queryLogs()*/
     this.nowUserid = JSON.parse(sessionStorage.getItem('active_account')).userid
+
+    var that = this;
+    // <!--把window.onresize事件挂在到mounted函数上-->
+    window.onresize = () => {
+      return (() => {
+        window.fullHeight = document.documentElement.clientHeight;
+        that.windowHeight = window.fullHeight; // 高
+      })()
+    };
   },
   watch: {
     $route () {
      /* this.queryLogs()*/
+    },
+    windowHeight (val) {
+      console.log("实时屏幕高度：",val );
+      console.log(this.windowHeight)
     }
   }
 }

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

@@ -166,7 +166,14 @@ export default {
       this.$emit('listData',this.list)
 
       // 保存一下列表数据用于翻页
-      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      let isGo = sessionStorage.getItem('isGo')
+      sessionStorage.setItem('total',res.total)
+      if (isGo == 1){
+      }else {
+        sessionStorage.setItem('listqueryid',res.listqueryid)
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      }
+    /*  this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})*/
     },
     selectChange () {
       this.param.content.pageNumber = 1

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

@@ -23,8 +23,8 @@
           </div>
           <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
          <div v-if="!pageChange">
-            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
-            <el-button size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()" :disabled="$route.query.rowindex == 1"></el-button>
+            <el-button size="mini" @click="next()" :disabled="$route.query.rowindex  == turnTotal"><i class="el-icon-arrow-right" ></i></el-button>
           </div>
         </div>
       </div>
@@ -108,6 +108,8 @@ export default {
       routerName:'',
       rowindex:0,
       total:0,
+      isPrevious:false,
+      turnTotal:sessionStorage.getItem('total'),
       param:{
         "id": '',
         "content": {
@@ -124,6 +126,7 @@ export default {
       refreshPage:true,
       reportCenterLsit:[],
       systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+      time:null
     }
   },
   computed:{
@@ -210,7 +213,56 @@ export default {
       })
     },
     async next () {
+      console.log('翻页了')
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        console.log('执行1')
+        this.nextOld()
+      }else {
+        console.log('执行22')
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (this.time !== null) {
+          clearTimeout(this.time)
+        }
+        this.time = setTimeout(() => {
+          this.upPageData(1,listqueryid)
+        }, 0);
+      }
+
+    },
+    async previous () {
+      if (this.$route.query.listqueryid === 'undefined' || !this.$route.query.listqueryid){
+        this.previousOld()
+      }else {
+        let rowindex = this.$route.query.rowindex
+        let listqueryid = sessionStorage.getItem('listqueryid')
+        if (rowindex >= 1) {
+          if (rowindex = 1){
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = true
+          }else {
+            if (this.time !== null) {
+              clearTimeout(this.time)
+            }
+            this.time = setTimeout(() => {
+              this.upPageData(0,listqueryid)
+            }, 0);
+            this.isPrevious = false
+          }
+        } else {
+          /*message.warn('已经是第一条了!')*/
+          this.isPrevious = true
+        }
+      }
+
+    },
+    async nextOld () {
       const rs = await this.checkPaginationData()
+
       if (rs == 0 && this.svlistData.listData.length == 1) return false
       if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
       let fun = (rs) =>{
@@ -237,7 +289,7 @@ export default {
         fun()
       }
     },
-    async previous () {
+    async previousOld () {
       const res = await this.checkPaginationData()
       if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
       const fun = (rs)=>{
@@ -265,6 +317,27 @@ export default {
         fun()
       }
     },
+    async upPageData (forward,listqueryid){
+      /*const hide = message.loading({content:'正在查询数据,请稍等..',duration:0,key:1});*/
+      const res = await this.$api.requested({
+        "classname": "system.tools",
+        "method":"querylistdatabyrowindex",
+        "content": {
+          "uniqueid":this.$route.query.id,
+          "rowindex": this.$route.query.rowindex,
+          "forward":forward,
+          "listqueryid": listqueryid,
+          "fieldname":this.$route.query.fieldname
+        }
+      })
+      if (res.data.data) {
+        console.log(listqueryid,'listqueryid数据获取了嘛')
+        this.$router.replace({path:this.$route.path,query:{id:res.data.data,rowindex:res.data.rowindex,listqueryid:listqueryid,fieldname:this.$route.query.fieldname}})
+        this.$emit('pageChange',res.data.data,this.$route.query.rowindex)
+      } else {
+       /* message.warn('已经是最后一条了!')*/
+      }
+    },
     onSuccess () {
       this.$emit('onEditSuccess')
 

src/components/normal-basic-layout/details/indexCopy.vue

@@ -0,0 +1,442 @@
+<template>
+  <div v-if="refreshPage" style="min-width:1200px">
+    <div style="margin:10px 10px 0 10px;border-radius:5px;position:relative" class="container normal-panel sticky" @click="closeTags">
+      <div class="flex-align-start flex-between normal-margin" style="flex-wrap:nowrap">
+        <div>
+          <p class="main_title mt-10">{{titleText?titleText:'##'}}</p>
+          <tagTemp v-if="activeApp.isdatatag" ref="tag" :categories="editData.categories" :modelName="modelName" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @sysTag="sysTag"></tagTemp>
+        </div>
+        <div class="flex-align-center" style="flex: 1 0 auto;  justify-content: flex-end;">
+          <div>
+            <slot name="customOperationBef"></slot>
+          </div>
+          <cpEdit v-if="tool.checkAuth($route.name,'update')" :formPath="formPath" :oldFormPath="oldFormPath" :data="editData" btnType="default" @onAddSuccess="onSuccess"></cpEdit>
+          <!-- 打印 -->
+          <reportCenter size="mini" position="detail" class="inline-16" :data="reportCenterLsit.filter(item => item.type == 'printinfo')" v-if="reportCenterLsit.filter(item => item.type == 'printinfo').length > 0 && systemappid != 163">
+            <template v-slot:print="scope2">
+              <el-button @click="printBtn($route.query.id,scope2.data)" type="text" size="mini">打 印</el-button>
+            </template>
+          </reportCenter>
+
+          <div>
+            <slot name="customOperation"></slot>
+          </div>
+          <el-button v-if="tool.checkAuth($route.name,'delete') && delApiId" :type="checkDisabled()?'':'primary'" class="inline-16" size="mini" :disabled="checkDisabled()" @click="deleteData">删 除</el-button>
+         <div v-if="!pageChange">
+            <el-button size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
+            <el-button size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
+          </div>
+        </div>
+      </div>
+      <div>
+        <slot name="d_head"></slot>
+      </div>
+      <div v-show="isTop">
+        <el-descriptions :column="column?column:5" size="mini">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData" :key="item.index" :label="item.label">
+            <span v-if="item.label === '关联应用数据'"  :style="item.style?item.style():''">
+              <span v-if="item.value !== ''">
+                <el-button v-if="item.value !== '--'" type="text" @click="onGoto()" style="margin: 0;padding: 0">
+                  {{item.value}}
+                </el-button>
+                <span v-else>--</span>
+              </span>
+              <span v-else>--</span>
+            </span>
+            <span v-else :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+        <el-descriptions :column="1" size="mini">
+          <el-descriptions-item label-class-name="my-label-layout" content-class-name="my-content" v-for="item in mainAData2" :key="item.index" :label="item.label">
+            <span :style="item.style?item.style():''">{{item.value !== ''?item.value:'--'}}</span>
+          </el-descriptions-item>
+        </el-descriptions>
+        <slot name="headerBottom"></slot>
+      </div>
+
+      <span @click="isTop=!isTop" style="color:#3874f6;position:absolute;right:10px;bottom:10px;cursor: pointer;">
+        <i :class="isTop ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
+        {{ isTop ? '收起' : '展开' }}
+      </span>
+    </div>
+    <div style="box-sizing: border-box;padding:10px">
+      <el-row class="flex-align-stretch no-wrap" :gutter="activeApp.isdatateam?10:activeApp.isdatafollowup?10:0">
+        <el-col style="flex:1 0 auto;" :span="activeApp.isdatateam?18:activeApp.isdatafollowup?18:24">
+          <slot name="customBefore"></slot>
+          <tabTemp :status="status" :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
+            <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
+              <slot :name="'slot' + index"></slot>
+            </div>
+          </tabTemp>
+          <slot name="custom"></slot>
+        </el-col>
+        <el-col v-if="collapse" style="width:400px;" :span="6">
+          <taskTemp ref="task" v-if="activeApp.istask" :status="status" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :typeTask="typeTask" :editData="editData" :idname="idname">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </taskTemp>
+          <group v-if="activeApp.isdatateam" :isGroup="isGroup" :status="status" ref="group" style="margin-bottom:10px"  :justsaler="justsaler" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess" @teamList="teamList">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </group>
+          <follow-up v-if="activeApp.isdatafollowup" :status="status" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" :editData="editData" :idname="idname">
+            <el-button slot="collapse" type="text" icon="el-icon-s-unfold" class="inline-16" @click="onCollapse"></el-button>
+          </follow-up>
+        </el-col>
+        <div v-else style="text-align-center" class="container normal-panel">
+          <el-button slot="collapse" type="text" icon="el-icon-s-fold" @click="onCollapse"></el-button>
+        </div>
+
+      </el-row>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import cpEdit from '../modules/cpEdit.vue'
+import followUp from './modules/followUp/followUp.vue'
+import tagTemp from './modules/tags/tag.vue'
+import tabTemp from './modules/tabs/tab.vue'
+import group from './modules/group/group.vue'
+import taskTemp from './modules/task/index.vue'
+import reportCenter from '../reportCenter/index'
+import {mapGetters} from 'vuex'
+export default {
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange','justsaler','mainData','status','typeTask','isGroup','isBatch','modelName','isDelete','column'],
+  data () {
+    return {
+      isTop:true,
+      routerName:'',
+      rowindex:0,
+      total:0,
+      param:{
+        "id": '',
+        "content": {
+          "isExport":false,
+          "pageNumber": 1,
+          "pageSize": 1,
+          "nocache": true,
+          "where": {
+            "condition": ""
+          }
+        }
+      },
+      collapse:true,
+      refreshPage:true,
+      reportCenterLsit:[],
+      systemappid:JSON.parse(sessionStorage.getItem('activeApp')).systemappid,
+    }
+  },
+  computed:{
+    mainAData () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label != '备注' && e.label != '优势信息' && e.label != '劣势信息') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+
+      }
+
+    },
+    mainAData2 () {
+      try {
+        let data = this.mainAreaData.filter(e=>{
+          if(e.label == '备注' || e.label == '优势信息' || e.label == '劣势信息') {
+            return e
+          }
+        })
+        return data
+      } catch (error) {
+
+      }
+
+    },
+    ...mapGetters({
+      activeApp:"activeApp",
+      svlistData:'svlistData'
+    })
+  },
+  components:{
+    cpEdit,
+    followUp,
+    group,
+    tagTemp,
+    tabTemp,
+    taskTemp,
+    reportCenter
+  },
+  methods:{
+    // async queryData (pageNumber) {
+    //   this.$emit('updateParam',this.param)
+    //   this.param.id = this.turnPageId
+    //   this.param.content.pageNumber = pageNumber
+    //   const res = await this.$api.requested(this.param)
+    //   this.total = res.total
+    //   this.$refs['tag']?this.$refs['tag'].queryTag():''
+    //   this.refresh()
+    // },
+    async nextData(param,fn) {
+      console.log('执行')
+      this.rowStatus = null
+      const res = await this.$api.requested(param)
+      this.$store.dispatch('saveListData',{listData:res.data,param:param,pageTotal:res.pageTotal})
+      fn?fn():''
+    },
+    /* 获取是否有报表数据 */
+    async getSystemAppid () {
+      let res = await this.$api.requested({
+        "id":20221213094401,
+        "content": {
+          "systemappid":this.systemappid,
+        }
+      })
+
+      this.reportCenterLsit = res.data || []
+      console.log('报表',this.reportCenterLsit);
+    },
+    async printBtn (data,data2) {
+      let res = await this.$api.requested({
+        "id":20221213094501,
+        "content": {
+          sys_reportid:data2.sys_reportid,
+          dataid:data[this.idName]
+        }
+      })
+      this.tool.showMessage(res,() => {
+
+        window.open(this.tool.getBaseUrl() + res.data + `&${this.idname}=${data}`)
+      })
+    },
+    async next () {
+      const rs = await this.checkPaginationData()
+
+      if (rs == 0 && this.svlistData.listData.length == 1) return false
+      if (rs == 1 && this.svlistData.param.content.pageNumber == this.svlistData.pageTotal) return false
+      let fun = (rs) =>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+        if (rs == 1) {
+          changeId = this.svlistData.listData[0][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index + 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (rs == 1) {
+        this.svlistData.param.content.pageNumber ++
+        this.nextData(this.svlistData.param,(rs)=>{
+          fun(1)
+        })
+      } else {
+        fun()
+      }
+    },
+    async previous () {
+      const res = await this.checkPaginationData()
+      if (res == 0 && this.svlistData.param.content.pageNumber == 1) return false
+      const fun = (rs)=>{
+        let nowId = this.$route.query.id
+        let changeId = ''
+
+        if (rs == 0) {
+          changeId = this.svlistData.listData[this.svlistData.listData.length - 1][this.idname]
+        } else {
+          this.svlistData.listData.forEach((e,index)=>{
+            if (e[this.idname] == nowId) {
+              changeId = this.svlistData.listData[index - 1][this.idname]
+            }
+          })
+        }
+        this.$emit('pageChange',changeId,this.idx)
+        this.refresh()
+      }
+      if (res == 0) {
+        this.svlistData.param.content.pageNumber --
+        this.nextData(this.svlistData.param,()=>{
+          fun(0)
+        })
+      } else {
+        fun()
+      }
+    },
+    onSuccess () {
+      this.$emit('onEditSuccess')
+
+    },
+    deleteData () {
+      this.$confirm('确定删除当前数据吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        let param = {
+          "id": this.delApiId,
+          "content":{}
+        }
+        if (this.isBatch === false){
+          param.content[`${this.idname}`] = this.editData[this.idname]
+        }else {
+          if (this.idname instanceof Array) { //判断传入的类型是多个还是单个idname
+            let obj = {}
+            this.idname.forEach(e=>{
+              obj[e] = ''
+            })
+            param.content[`${this.idname[0]}s`] =  [Object.keys(obj).map((key,item)=>{
+              obj[key] = this.editData[key]
+            })]
+          } else if(this.isDelete){
+            param.content[`${this.idname}`] = this.editData[this.idname]
+          } else {
+            param.content[`${this.idname}s`] = [this.editData[this.idname]]
+          }
+        }
+        const res = await this.$api.requested(param)
+        this.tool.showMessage(res,()=>{
+          this.$store.dispatch('changeDetailDrawer',false)
+        })
+      }).catch((err) => {
+
+        console.log(err)
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    checkDisabled () {
+      if (this.statusCheck) {
+        let _isSame = this.statusCheck.some(item=>item.value === this.editData[item.key])
+        return _isSame
+      } else {
+        return false
+      }
+    },
+    onTabClick () {
+      this.$emit('onTabClick')
+    },
+    onCollapse () {
+      this.collapse?this.collapse = false:this.collapse = true
+    },
+    refresh () {
+      this.refreshPage = false
+      setTimeout(() => {
+        this.refreshPage = true
+      }, 10);
+    },
+    refreshTag () {
+      this.$refs.tag.queryTag()
+    },
+    closeTags() {
+      this.$refs.tag?this.$refs.tag.closeTag():''
+    },
+
+    checkPaginationData () {
+      return new Promise((reslove,reject)=>{
+        let id = this.$route.query.id
+        let n = 0
+        this.svlistData.listData.filter((e,index)=>{
+          if (e[this.idname] == id){
+
+            n = index
+          }
+        })
+        if (n == 0) {
+          reslove(0)
+        } else if (n == this.svlistData.listData.length - 1) {
+          reslove(1)
+        } else {
+          reslove(-1)
+        }
+      })
+    },
+
+    sysTag(val){
+      this.$emit('sysTag',val)
+    },
+
+
+    /*任务页面跳转*/
+    onGoto(){
+      let path = this.mainData.path
+      let route = this.$route
+      if (route.path !== path.slice(1)){
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$router.push({
+        path:path,
+        query:{
+          id:this.mainData.ownerid,
+          rowindex:this.mainData.rowindex
+        }
+      })
+    },
+    /*任务协助人*/
+    teamList(val){
+      this.$emit('teamList',val)
+    }
+  },
+  mounted () {
+    // this.checkPaginationData()
+    this.idx = this.$route.query.rowindex
+
+  },
+  created () {
+    this.$emit('detailCreate',this.param)
+    this.routerName = this.$route.meta.title
+    this.rowindex = Number(this.$route.query.rowindex)
+    this.getSystemAppid()
+  },
+  watch:{
+    mainAreaData () {
+      // console.log(this.mainAData,'mainAData')
+      // this.checkPaginationData()
+    }
+  }
+}
+
+</script>
+<style>
+.detail__head__label{
+  display: inline-block;
+  width: 70px;
+}
+.my-label-layout{
+  font-size: 14px;
+  color: #999;
+}
+</style>
+<style scoped>
+.appname{
+  display: inline;
+  background: #FA8C19;
+  color:#fff;
+  border-radius: 4px;
+  padding: 2px 10px;
+  font-size: 12px;
+}
+.my-tabs{
+  background:#eeeeee
+}
+.sticky{
+  position: sticky;
+  top:0;
+  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
+}
+.no-wrap{
+  flex-wrap:nowrap !important;
+}
+.main_title{
+  font-size:30px;
+  font-weight:300;
+  margin-right:16px;
+  line-height: 32px;
+}
+</style>

src/components/normal-basic-layout/details/modules/followUp/followUp.vue

@@ -1,17 +1,20 @@
 <template>
-  <div class="normal-panel follow__panel" >
+  <div class="normal-panel follow__panel" id="containerFull">
     <div class="container flex-align-center flex-between">
       <div>
         <slot name="collapse"></slot>
         <p class="inline-16">跟进动态</p>
       </div>
-      <addLog :ownertable="ownertable" @onSuccess="queryLogs" :status="status"></addLog>
+      <div style="display: flex;justify-content: space-between">
+        <fullScreen class="inline-16" domId="containerFull" @onFull="onFull" @backFull="backFull"></fullScreen>
+        <addLog :ownertable="ownertable" @onSuccess="queryLogs" :status="status"></addLog>
+      </div>
     </div>
     <div  class="container" >
       <div v-if="logList.length === 0">
         <el-empty description="暂无记录" :image-size="40"></el-empty>
       </div>
-      <div>
+      <div :style="{overflow: isFull?'auto':'none',height:isFull?(windowHeight - 100) + 'px':''}">
         <el-timeline>
           <el-timeline-item
             v-for="i in logList" :key="i.index"
@@ -132,7 +135,7 @@
 <script>
 import upload from '@/components/upload/hw_obs_upload.vue'
 import previewImage from '@/components/previewImage/index.vue'
-
+import fullScreen from "@/views/salesData/components/fullScreen";
 import addLog from './addLog.vue'
 import editLog from './editLog.vue'
 export default {
@@ -141,7 +144,8 @@ export default {
     addLog,
     editLog,
     upload,
-    previewImage
+    previewImage,
+    fullScreen
   },
   data () {
     return {
@@ -149,7 +153,9 @@ export default {
       logList:[],
       nowUserid:'',
       ownertableNew:'',
-      owneridNew:''
+      owneridNew:'',
+      isFull:false,
+      windowHeight: window.innerHeight,  //实时屏幕高度
     }
   },
   methods:{
@@ -209,15 +215,40 @@ export default {
       this.tool.showMessage(res,()=>{
         this.queryLogs()
       })
+    },
+    /*全屏*/
+    onFull(){
+      this.heightChart = this.windowWidth > 1128 ? 'calc(100vh - 85px)':'calc(100vh - 115px)'
+      this.isFull = true
+    },
+    /*退出全屏*/
+    backFull(val){
+      this.heightChart = '100%'
+      this.isFull = false
+      this.$emit('backFull',val)
     }
   },
   mounted () {
     this.queryLogs()
+    console.log(this.windowHeight,'windowHeight高度')
     this.nowUserid = JSON.parse(sessionStorage.getItem('active_account')).userid
+
+    var that = this;
+    // <!--把window.onresize事件挂在到mounted函数上-->
+    window.onresize = () => {
+      return (() => {
+        window.fullHeight = document.documentElement.clientHeight;
+        that.windowHeight = window.fullHeight; // 高
+      })()
+    };
   },
   watch: {
     $route () {
       this.queryLogs()
+    },
+    windowHeight (val) {
+      console.log("实时屏幕高度：",val );
+      console.log(this.windowHeight)
     }
   }
 }

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

@@ -23,7 +23,9 @@ export default {
       } else {
         key = this.idName
       }
-      let query = {id:this.data[key],rowindex:this.data.rowindex - 1}
+      sessionStorage.setItem('isGo','0')
+      let listqueryid = sessionStorage.getItem('listqueryid')
+      let query = {id:this.data[key],rowindex:this.data.rowindex,listqueryid:listqueryid}
       this.$router.push({path:this.detailPath.path,query:Object.assign({},query,this.detailPath.param)})
       this.$store.dispatch('changeDetailDrawer',true)
     }
@@ -43,4 +45,4 @@ export default {
   color:#666;
   height:100vh;
 }
-</style>
+</style>

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

@@ -167,7 +167,15 @@ export default {
       this.$emit('listData',this.list)
 
       // 保存一下列表数据用于翻页
-      this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      let isGo = sessionStorage.getItem('isGo')
+      sessionStorage.setItem('total',res.total)
+      console.log('执行了嘛数据1111')
+      if (isGo == 1){
+      }else {
+        sessionStorage.setItem('listqueryid',res.listqueryid)
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.param,pageTotal:res.pageTotal})
+      }
+
     },
     selectChange () {
       this.param.content.pageNumber = 1

src/template/tableMainLayout/index.vue

@@ -5,12 +5,13 @@
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
       </div> -->
-<!--      <el-table-column
+      <el-table-column
           type="selection"
+          v-if="isCheck === true"
           width="45"
           align="center"
           @handleSelectionChange="handleSelectionChange">
-      </el-table-column>-->
+      </el-table-column>
       <el-table-column show-overflow-tooltip v-for="(col) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template slot-scope="scope">
 
@@ -50,7 +51,7 @@ export default {
     custom:是否启用自定义结构;
     opwidth:操作列宽度
   */
-  props:['data','tableName','custom','layout','fixRightData','fixLeftData','height','fixedName','redirect'],
+  props:['data','tableName','custom','layout','fixRightData','fixLeftData','height','fixedName','redirect','isCheck'],
   data () {
     return {
       list:[],

src/views/salesData/components/fullScreen.vue

@@ -18,9 +18,7 @@ export default {
   methods:{
     /*全屏*/
     enterFullscreen(){
-      console.log('执行111')
       this.scrollSave = this.scrollHeight
-      console.log(this.scrollSave,'save')
       /* 获取(<html>)元素以全屏显示页面 */
       const full = document.getElementById(this.domId)
       if (full.RequestFullScreen) {

src/views/salesData/modules/orderType.vue

@@ -53,8 +53,8 @@
         </div>
       </div>
       <div class="chart" style="height: 416px">
-        <div id="orderTypeChart" style="height: 400px;" :style="{height:heightChart,width:windowWidth < 1505?'54%':windowWidth<1805?'54%':windowWidth<2500?'45%':'30%',float:'left'}"></div>
-        <div style="float: right;" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:70%'">
+        <div id="orderTypeChart" style="height: 400px;" :style="{height:heightChart,width:windowWidth < 1505?'54%':windowWidth<1805?'54%':windowWidth<2500?'45%':'42%',float:'left'}"></div>
+        <div style="float: right;" :style="windowWidth<1505?'width:46%':windowWidth<1805?'width:46%':windowWidth<2500?'width:55%':'width:58%'">
           <tableTemplate style="margin-top: 10px" ref="table" :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="heightTable" fixedName="operation">
             <template v-slot:customcol="scope">
               <p v-if="scope.column.columnname === 'operation'">
@@ -132,7 +132,8 @@ export default {
       chartData:[],
       heightChart:'98%',
       heightTable:'352px',
-      isFull:false
+      isFull:false,
+      listqueryid:''
     }
   },
   methods:{
@@ -150,11 +151,15 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.listqueryid = res.listqueryid
+        sessionStorage.setItem('total',res.total)
       }
 
       if (this.type === '金额'){
@@ -187,11 +192,15 @@ export default {
           this.list = res.data
           this.total = res.total
           this.currentPage = res.pageNumber
+          this.listqueryid = res.listqueryid
+          sessionStorage.setItem('total',res.total)
         }
       }else {
         this.list = res.data
         this.total = res.total
         this.currentPage = res.pageNumber
+        this.listqueryid = res.listqueryid
+        sessionStorage.setItem('total',res.total)
       }
       if (this.type === '金额'){
         this.totalamount = '¥'+this.tool.formatAmount(res.data[0].ratio[0].total/10000,2)+'万'
@@ -218,6 +227,8 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      this.listqueryid = res.listqueryid
+      sessionStorage.setItem('total',res.total)
     },
     renderPie(val){
       this.chartPie = new Pie('orderTypeChart',{
@@ -327,13 +338,19 @@ export default {
           this.oldRoute = {path:route.path,query:route.query}
           this.$store.dispatch('setHistoryRouter',this.oldRoute)
         }
+        sessionStorage.setItem('listqueryid',this.listqueryid)
+        sessionStorage.setItem('isGo','1')
         this.$router.push({
           path:'/orderdetail',
           query:{
             id:data.sa_orderid,
+            rowindex:data.rowindex,
+            listqueryid:this.listqueryid,
+            fieldname:'sa_orderid',
             portrait:''
           }
         })
+        this.$store.dispatch('saveListData',{listData:this.list,param:this.params,pageTotal:this.pageTotal})
       })
     },
     /*全屏*/