系统提醒设置，销售漏斗，合作伙伴，订单管理，蓝票翻页调整

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -104,12 +104,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     // 删除明细
     async deleteRow (row) {
@@ -136,4 +136,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

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

@@ -91,7 +91,7 @@
           width="180"
           fixed="right">
           <template slot-scope="scope">
-            <el-input size="mini" @input="onInput(scope.row,scope.$index)"  v-model="scope.row.newvalue"></el-input>
+            <el-input size="mini" @input="onInput(scope.row,scope.$index)"  v-model="scope.row.newvalue" type="number"></el-input>
           </template>
         </el-table-column>
       </el-table>

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

@@ -57,6 +57,7 @@
     </div>
     <div slot="slot0">
       <el-button v-if="tool.checkAuth($route.name,'agentTeamTable')" size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建团队账号</el-button>
+      <el-button v-if="tool.checkAuth($route.name,'agentTeamTable')" size="small" type="primary" @click="createAgentSubAccount" class="normal-margin">创建团队子账号</el-button>
       <tableLayout :layout="tablecols" :data="mainData.hrs" :custom="true" height="calc(100vh - 425px)">
         <template v-slot:customcol="scope">
           <div v-if="scope.column.columnname === 'name'">
@@ -321,6 +322,33 @@ export default {
           message: '取消创建'
         });
       });
+    },
+    createAgentSubAccount () {
+      this.$confirm('是否继续创建团队子账户?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": 20220920084301,
+          "content": {
+            "sys_enterpriseid":this.mainData.sys_enterpriseid,
+            "usertype":22
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.queryMainData()
+        })
+        /*this.$message({
+          type: 'success',
+          message: '创建成功!'
+        });*/
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消创建'
+        });
+      });
     }
   },
   mounted () {

src/HManagement/siteManage/systemRemind/index.vue

@@ -1,16 +1,16 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'HManagement/siteManage/systemRemind/components'
       }"
-      tableName="systemRemindTable" 
-      idName="sys_remind_configid" 
+      tableName="systemRemindTable"
+      idName="sys_remind_configid"
       :apiId="{query:20221220153101,del:''}"
       :options="options"
-      :hideSearch="true">
+      :hideSearch="false">
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
         <div>
@@ -30,7 +30,7 @@ export default {
   data () {
     return {
       options:[]
-      
+
     }
   },
   components: {Edit},
@@ -40,4 +40,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/invoiceapp_saler/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -103,12 +103,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     // 删除明细
     async deleteRow (row) {
@@ -135,4 +135,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/SDrpManagement/sinvoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -92,12 +92,12 @@ export default {
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.listData()
+      this.listData(this.param.content.sa_invoicebillid)
     },
     // 删除明细
     async deleteRow (row) {
@@ -124,4 +124,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -16,6 +16,13 @@
         </el-option>
       </el-select>
     </div>
+    <div class="inline-16">
+      <p class="search__label">领域:</p>
+      <el-select v-model="tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择领域" @change="dataParam.content.where.tradefield = tradefield;projectParam.content.where.tradefield = tradefield;getProportionOfFileModel()">
+        <el-option v-for="item in tradefields" :label="item.value" :key="item.rowindex" :value="item.value">
+        </el-option>
+      </el-select>
+    </div>
     <div class="inline-16" style="margin-top:0px;margin-bottom: 20px">
       <el-button-group>
         <el-button size="small" :type="dataParam.content.dateType==1?'primary':''" @click="dataChange(1)" >近一年</el-button>
@@ -219,7 +226,8 @@ export default {
             "begindate": "",
             "begdate":"",
             "enddate":"",
-            "departmentid":""
+            "departmentid":"",
+            "tradefield":""
           }
         }
       },
@@ -235,10 +243,13 @@ export default {
           "where": {
             "begdate":"",
             "enddate":"",
+            "tradefield":""
           }
         }
       },
-      dateSelect:[]
+      dateSelect:[],
+      tradefield:'',
+      tradefields:[],
     }
   },
   methods:{
@@ -779,11 +790,17 @@ export default {
       this.projectParam.content.pageNumber = val
       this.getProjectList()
     },
+    /*获取领域*/
+    async queryTradeField(){
+      const res = await this.$store.dispatch('optiontypeselect','tradefield')
+      this.tradefields = res.data
+    }
   },
   mounted () {
    /* this.renderPie()*/
     this.departmentrtment()
     this.dateSet(1)
+    this.queryTradeField()
   },
   created() {
     this.tablecols = this.tool.tabelCol(this.$route.name).projectTable.tablecols