暂存

src/HDrpManagement/bankStatement/index.vue

@@ -10,7 +10,8 @@
       :options="options"
       :detailPath="{
         path:'/bankStatementDetail'
-      }">
+      }"
+      @listData="list">
       <div slot="custom">
         <div class="label_center">
           <p class="search__label">状态:</p>
@@ -22,6 +23,12 @@
           </el-select>
         </div>
       </div>
+      <div slot="custom-right">
+        <div class="label_center">
+          <p class="search__label" style="width:200px">最新数据更新时间:</p>
+          <el-input readonly v-model="time" size="small"></el-input>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.data[[scope.data.column.columnname]]">
           <span v-if="scope.data.column.columnname == 'status'">
@@ -47,11 +54,14 @@ export default {
   data () {
     return {
       options:[],
-      status:''
-      
+      status:'',
+      time:'暂无'
     }
   },
   methods:{
+    list (data) {
+      if (data.length) this.time = data[0].lastruntime
+    }
   }
 }
 

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -31,7 +31,6 @@
             </template>
           </Table>
            <div style="display:flex;justify-content:space-between;align-items:center;margin-top:10px">
-            <span>已添加产品数:{{addProductLength}}</span>
 <!--            <el-pagination
                 style="display:inline-block"
                 background
@@ -81,7 +80,7 @@ export default {
         "content": {
             "sa_contractid": '',
             "pageNumber": 1,
-            "pageSize": 99999,
+            "pageSize": 20,
             "where": {
                 "condition": ""
             }
@@ -103,6 +102,8 @@ export default {
   },
   methods: {
     selectArr (data) {
+      console.log(data,data.length);
+      
       this.selectProductLength = data.length
     },
     addBtn () {

src/HDrpManagement/contractManage/index.vue

@@ -101,6 +101,9 @@
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '工具借用'">工具使用协议</span>
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">居间协议</span>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'signamount'">
+          <span>{{ tool.formatAmount(scope.data.column.data.signamount,1) }}</span>
+        </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
 <!--          <div v-if="scope.data.column.data"></div>-->
 <!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->

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

@@ -321,7 +321,7 @@ export default {
     checkNB () {
       let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
-        return false
+        return true
       } else {
         return false
       }

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -119,11 +119,7 @@ export default {
           value:this.mainData.billdate
         },
         {
-          label:'经销商',
-          value:this.mainData.enterprisename
-        },
-        {
-          label:'订单状态',
+          label:'状态',
           value:this.mainData.status,
           style:function () {
             let style = {}
@@ -153,17 +149,25 @@ export default {
           }
         },
         {
-          label:'合同',
-          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+          label:'企业名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'合计数量',
           value:this.mainData.qty * this.mainData.toolcount
         },
         {
-          label:'金额',
+          label:'合计金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
         },
+        {
+          label:'借用合同',
+          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+        },
+        {
+          label:'审核日期',
+          value:this.mainData.checkdate
+        },
         {
           label:'收货人',
           value:this.mainData.name
@@ -172,10 +176,7 @@ export default {
           label:'收货地址',
           value:this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address
         },
-        {
-          label:'审核日期',
-          value:this.mainData.checkdate
-        },
+
         {
           label:'备注',
           value:this.mainData.remarks

src/HDrpManagement/workBillModule/modules/taskDetail/index.vue

@@ -24,6 +24,11 @@
       <el-table-column
         width="120">
       </el-table-column>
+      <el-table-column
+        prop="sequence"
+        label="序号"
+        width="80px">
+      </el-table-column>
       <el-table-column
         prop="workname"
         label="工作名称"

src/HDrpManagement/writeoffbill/modules/detail.vue

@@ -142,6 +142,10 @@ export default {
             return style
           }
         },
+        {
+          label:'备注',
+          value:this.mainData.remarks
+        },
       ]
       this.detailInfo = {
         baseInfo: [
@@ -196,6 +200,10 @@ export default {
               return style
             }
           },
+          {
+            label:'备注',
+            value:this.mainData.remarks
+          },
         ],
         systemInfo: [
           {label:'创建人',value:this.mainData.createby},

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -20,7 +20,7 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <el-button type="text" size="mini" @click="getMatchAgentList(scope.data)">{{scope.data.sales.length === 0?'匹 配':'更 换'}}</el-button>
+            <el-button type="text" size="mini" @click="getMatchAgentList(scope.data)" :style="scope.data.sales.length === 0?'':'color:#d73a33'">{{scope.data.sales.length === 0?'匹 配':'更 换'}}</el-button>
           </template>
         </tableLayout>
       </div>
@@ -46,7 +46,8 @@
             <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           </template>
           <template v-slot:opreation="scope">
-            <i :style="act_saler.hrid === scope.data.hrid?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>
+<!--            <i :style="act_saler.hrid === scope.data.hrid?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>-->
+            <i :style="scope.data.ismatch=== 1?'color:#3774f6':''" class="el-icon-success large-icon" @click="selectSaler(scope)"></i>
           </template>
         </tableLayout>
       </div>

src/HManagement/clueManage/clue_rule/modules/setSaler.vue

@@ -3,7 +3,7 @@
     <div class="flex-align-center flex-between">
       <el-form size="small" inline label-position="right" label-width="50px" :model="search">
         <el-form-item label="搜索">
-          <el-input v-model="search.condition" prefix-icon="el-icon-search" placeholder="编号,业务员名称" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input v-model="search.condition" prefix-icon="el-icon-search" placeholder="编号,业务员名称,手机号码" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         </el-form-item>
       </el-form>
       <slot name="add" class="normal-margin"></slot>

src/HManagement/marketing2/agent/details/modules/field/add.vue

@@ -83,6 +83,8 @@ export default {
         "id":20221011144603,
         "content": {
           sa_saleareaid:'',
+          "pageNumber":1,
+          "pageSize":20,
           "where": {
             "condition": ""
           }

src/HManagement/roleManage/modules/auth_list3.vue

@@ -0,0 +1,118 @@
+<template>
+  <div style="display:inline">
+    <el-button type="primary" size="mini" @click="onShow" icon="el-icon-thumb">授 权</el-button>
+    <el-drawer class="auth-container" title="授权报表列表" append-to-body :visible.sync="dialogTableVisible" size="50%">
+      <div class="container">
+          <div class="flex-align-center normal-margin">
+        <p style="width:50px">搜索:&nbsp;</p>
+        <el-input style="width:250px" v-model="value" size="small" @keyup.native.enter="listData(param.content.where.condition = value)" @clear="listData(param.content.where.condition = '')" placeholder="应用名称" clearable></el-input>
+      </div>
+      <el-row>
+        <el-col :span="24">
+          <Table ref="table" :layout="tablecols" :data="list" :custom="false" height="500px">
+          </Table>
+          <div style="margin:20px 0;text-align:right">
+            <el-pagination
+              background
+              small
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="param.content.pageNumber"
+              :page-size="param.content.pageSize"
+              layout="total, prev, pager, next, jumper"
+              :total="total">
+            </el-pagination>
+          </div>
+        </el-col>
+      </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+
+  </div>
+</template>
+
+<script>
+import Table from './table'
+export default {
+  props:['data'],
+  components:{Table},
+  data () {
+    return {
+      dialogTableVisible:false,
+      param:{
+        "id":20221213141501,
+        "content": {
+            "roleid":'',
+            "pageNumber": 1,
+            "pageSize": 10,
+            "where":{
+              "condition":"",
+            
+            }
+        }
+      },
+      list:[],
+      total:0,
+      value:'',
+      tablecols:[]
+    }
+  },
+  created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name).userCenter.tablecols
+
+  },
+  methods:{
+    async listData () {
+      this.param.content.roleid = this.$route.query.id
+      let res = await this.$api.requested(this.param)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list);
+      
+    },
+    onShow () {
+      this.dialogTableVisible = true
+      this.listData()
+    },
+    async onSubmit () {
+      let result = this.$refs.table.allArr.map(item => item.sys_reportid)
+      let res = await this.$api.requested({
+        "id":20221213141801,
+        "content": {
+          roleid:this.$route.query.id,
+          sys_reportids: result
+        }
+      })
+      console.log(res);
+      this.tool.showMessage(res,() => {
+        this.$emit('onSuccess')
+        this.dialogTableVisible = false
+      })
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.query_all_auth()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.query_all_auth()
+    },
+  }
+}
+
+</script>
+<style>
+.auth-container .el-tabs--border-card{
+  box-shadow: none !important;
+}
+.auth-container .el-tabs--border-card>.el-tabs__content{
+  padding: 0;
+}
+</style>

src/HManagement/roleManage/modules/role_details.vue

@@ -11,7 +11,7 @@
         idname="roleid"
         ownertable="sys_role"
         tags=""
-        :tabs="['角色授权','报表授权','数据过滤']"
+        :tabs="['角色授权','报表授权','用户授权','数据过滤']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -32,6 +32,11 @@
         </reportCenter>
       </div>
       <div class="container normal-panel" slot="slot2" >
+        <userCenter :data="{roleid:$route.query.id}" @onSuccess="onSuccess">
+          <el-button slot="cancel" size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        </userCenter>
+      </div>
+      <div class="container normal-panel" slot="slot3" >
        <dataFiltering :data="{roleid:$route.query.id}">
 
        </dataFiltering>
@@ -43,6 +48,7 @@
 <script>
 import roleContentTemp from './roleContent'
 import reportCenter from './reportCenter'
+import userCenter from './userCenter'
 import dataFiltering from './dataFiltering'
 export default {
   name: "detail",
@@ -71,6 +77,7 @@ export default {
   components:{
     roleContentTemp,
     reportCenter,
+    userCenter,
     dataFiltering
   },
   methods:{

src/HManagement/roleManage/modules/userCenter.vue

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <div style="display:flex;align-items:center">
+<!--      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="small"
+          class="input-with-select inline-16"
+          @keyup.native.enter="listData()"
+          @clear="listData()"
+          clearable>
+      </el-input>-->
+      <!-- <auth v-if="tool.checkAuth($route.name,'reportCenterAuth')" class="inline-16" @onSuccess="listData()"></auth> -->
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true"  :height="tableHieght" >
+        <template v-slot:customcol="scope">
+          <div v-if="scope.column.columnname === 'province'">
+            <p>{{ scope.column.data.province + '-' + scope.column.data.city + '-' + scope.column.data.county}}</p>
+          </div>
+          <div v-else-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation'">--</div>
+          <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
+        </template>
+        <template v-slot:opreation="scope">
+          <el-popconfirm v-if="tool.checkAuth($route.name,'reportCenterAuthDelete')" title="确定删除当前权限吗？" @confirm="deleteRow(scope.data.sys_reportid)">
+            <el-button slot="reference" size="mini" type="text">删 除</el-button>
+          </el-popconfirm>
+        </template>
+      </tableLayout>
+    </div>
+    <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.content.pageNumber"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import auth from './auth_list3'
+export default {
+  name: '',
+  components:{auth},
+  data() {
+    return {
+      tablecols:[],
+      list:[],
+      params: {
+          "id": "20230302135404",
+          "content": {
+              "roleid":276,
+              "pageNumber":1,
+              "pageSize":20
+          }
+      },
+      total:0
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  created () {
+    this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).userCenter.tablecols
+    console.log(this.tablecols);
+    
+  },
+  methods: {
+    async listData () {
+      this.params.content.roleid = this.$route.query.id
+      let res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list);
+    },
+    async deleteRow (id) {
+      let res = await this.$api.requested({
+        "id":20221213141701,
+        "content": {
+          roleid:this.$route.query.id,
+          sys_reportids:[id]
+        }
+      })
+      this.tool.showMessage(res,() => {
+        this.listData()
+      })
+    },
+    onSuccess () {
+
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+};
+</script>
+
+<style scoped>
+
+</style>

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -4,9 +4,9 @@
   <el-tag style="margin-left: 15px" size="small" >{{selectProduct.brandname}}</el-tag>
   <div class="product-detail container flex-align-stretch" style="width: 100%;flex-wrap:nowrap">
     <div>
-      <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
+     <el-image style="width:400px;height:400px;margin-right:30px" :src="actImage?actImage.url:''" fit="cover" />
       <div class="flex-align-stretch column">
-        <el-image class="thumImage mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
+        <el-image class="thumImage  mt-10" :class="item.attachmentid === actImage.attachmentid?'act':''" v-for="item in selectProduct.attinfos" :key="item.index" :src="item.url" @click="actImage = item" fit="cover" />
       </div>
     </div>
 
@@ -27,7 +27,7 @@
         <p class="normal-margin">标准:&emsp;{{selectProduct.standards || '--'}}</p>
       </div>
       <div v-if="selectProduct.itemextend">
-        <p class="normal-margin">材质:&emsp;{{selectProduct.itemextend.length? selectProduct.itemextend[0].material :'--'}}</p>
+        <p class="normal-margin">材质:&emsp;{{selectProduct.itemextend.length? selectProduct.itemextend[0].material?selectProduct.itemextend[0].material:'--' :'--'}}</p>
       </div>
       <div class="flex-align-center" style="margin-bottom:30px">
         <p>数量:&emsp;</p>
@@ -50,7 +50,7 @@
         <div class="content normal-margin" style="max-height:300px;width:850px;overflow-y:scroll;">
 <!--          <p class="inline-16">更多:</p>-->
           <el-tag class="inline-16" style="margin-top: 5px;margin-bottom: 5px;width: 120px" @click="typeClick(item)" v-for="(item,index) in detail" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">
-            {{item.spec.length >14?item.spec.substring(0,13)+'...':item.spec}}
+            {{item.spec?item.spec.length >14?item.spec.substring(0,13)+'...':item.spec:item.spec}}
           </el-tag>
 <!--          <span style="color: #4f7bfd;width: 100px"  @click="typeClick(item)" v-for="(item,index) in detail" :key="index">
               {{item.model}}
@@ -153,12 +153,14 @@ export default {
           "sa_itemgroupid": this.$route.query.id
         }
       })
+      res.code === 0 ?this.$message.error(res.msg): console.log(res.data.itemextend)
+
       this.detail = res.data
       this.selectProduct = this.detail ? this.detail[0] : ''
-      this.actImage = this.detail ? this.detail[0].attinfos[0] : {}
+      this.actImage = this.detail ? this.detail[0].attinfos ? this.detail[0].attinfos[0]:{} : {}
       this.tradefield  = this.detail ? this.detail[0].tradefield : []
-      this.actTradefield = this.detail[0].tradefield[0].tradefield
-       this.count = this.detail ? this.detail[0].orderminqty : []
+      this.actTradefield = this.detail?this.detail[0].tradefield?this.detail[0].tradefield[0]:'':''
+
     },
     countChange (num) {
       this.count = num

src/SDrpManagement/agentOrder/details/index.vue

@@ -17,8 +17,17 @@
         <div slot="customOperation" class="inline-16">
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交'" type="primary" size="mini" @click="reback">撤 回</el-button>
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <customBtn 
+            btnName="撤回"
+            message="确认撤回当前订单吗?"
+            idName="20230301190202"
+            keyName="sa_orderid"
+            :id="$route.query.id"
+            @onSuccess="queryMainData"
+            class="inline-16"
+            v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
+          />
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
           
       </div>

src/SDrpManagement/salerOrder/details/index.vue

@@ -17,8 +17,17 @@
         <div slot="customOperation" class="inline-16">
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="queryMainData();$refs.prod && $refs.prod.listData()" />
           <el-button :disabled="mainData.status !== '交期待确认'"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交'" type="primary" size="mini" @click="reback">撤 回</el-button>
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <customBtn 
+            btnName="撤回"
+            message="确认撤回当前订单吗?"
+            idName="20230301190202"
+            keyName="sa_orderid"
+            :id="$route.query.id"
+            @onSuccess="queryMainData"
+            class="inline-16"
+            v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
+          />
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
       </div>
       <div slot="slot1">

src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -69,10 +69,6 @@ export default {
           label:'单据日期',
           value:this.mainData.billdate
         },
-        {
-          label:'经销商',
-          value:this.mainData.enterprisename
-        },
         {
           label:'状态',
           value:this.mainData.status,
@@ -104,17 +100,25 @@ export default {
           }
         },
         {
-          label:'合同',
-          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+          label:'企业名称',
+          value:this.mainData.enterprisename
         },
         {
           label:'合计数量',
           value:this.mainData.qty * this.mainData.toolcount
         },
         {
-          label:'金额',
+          label:'合计金额',
           value:this.tool.formatAmount(this.mainData.amount,2)
         },
+        {
+          label:'借用合同',
+          value:this.mainData.contract_title?this.mainData.contract_title:'无合同'
+        },
+        {
+          label:'审核日期',
+          value:this.mainData.checkdate
+        },
         {
           label:'收货人',
           value:this.mainData.name
@@ -123,10 +127,7 @@ export default {
           label:'收货地址',
           value:this.mainData.province + this.mainData.city + this.mainData.county + this.mainData.address
         },
-        {
-          label:'审核日期',
-          value:this.mainData.checkdate
-        },
+
         {
           label:'备注',
           value:this.mainData.remarks

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

@@ -48,7 +48,8 @@ export default {
         "content": {
           "name":'',
           "phonenumber":'',
-          "email":''
+          "email":'',
+          "password":''
         }
       },
       ruleForm: {
@@ -63,7 +64,7 @@ export default {
          { required: true, message: '请输入姓名', trigger: 'blur' }
         ],
         phonenumber:[
-         { required: true, message: '请输入手机号', trigger: 'blur' },
+        //  { required: true, message: '请输入手机号', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }
         ],
         email:[

src/components/financialInfo/index.vue

@@ -134,10 +134,12 @@ export default {
     },
     clearData(){
       this.search = ""
+      this.queryfinancialinfo()
     },
     queryClick(){
-      this.params.content.where.condition = this.search
-      this.listData()
+      this.param.content.where.condition = this.search
+      this.param.content.pageNumber = 1
+      this.queryfinancialinfo()
     }
   },
   mounted () {

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

@@ -36,6 +36,7 @@
           <slot name="custom"></slot>
           <el-input v-if="!hideSearch" style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="clearSearchValue" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
+          <slot name="custom-right"></slot>
         </div>
       </div>
       <div class="normal-panel flex-align-center" style="padding:0 16px">

src/template/selectSaler/index.vue

@@ -2,13 +2,15 @@
   <div> 
     <el-dialog :visible.sync="visible" append-to-body width="900px">
       <div class="flex-align-center flex-between mt-10">
-        <el-input style="width:200px;" placeholder="搜索"
-                  :suffix-icon="search?search.length > 0?'':'':'el-icon-search'"
-                  v-model="search"
-                  @keyup.native.enter="searchQuery"
-                  @clear="searchQuery"
-                  size="small" class="input-with-select inline-16 layout_search__panel" clearable>
-        </el-input>
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          @input="valueChange"
+          v-model="condition"
+          @keyup.enter.native="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" 
+          @clear="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" clearable></el-input>
       </div>
       <div>
         <el-table
@@ -60,11 +62,10 @@
           <el-pagination
             background
             small
-            @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="param.content.pageSize"
-            layout="total, prev, pager, next, jumper"
+            :current-page="customParam ? customParam.content.pageNumber : param.content.pageNumber"
+            :page-size="customParam ? customParam.content.pageSize : param.content.pageSize"
+            layout="total, pager, next, jumper"
             :total="total">
           </el-pagination>
         </div>
@@ -93,7 +94,8 @@ export default {
       tableData: [],
       total:0,
       currentPage:0,
-      search:''
+      search:'',
+      condition:''
     }
   },
   methods:{
@@ -105,30 +107,36 @@ export default {
       console.log(this.tableData);
       
     },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
-      this.listData()
+    valueChange (data) {
+      console.log(data);
+      if (this.customParam) {
+        this.customParam.content.where.condition = data
+      } else {
+        this.param.content.where.condition = data
+      }
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
-      this.param.content.pageNumber = val
+      if (this.customParam) {
+        this.customParam.content.pageNumber = val
+      } else {
+        this.param.content.pageNumber = val
+      }
       this.listData()
     },
     selectRow (row) {
       this.$emit('selectRow',row)
     },
-    searchQuery(){
-      /*this.customParam.content.where.condition = this.search*/
-      this.param.content.where.condition = this.search
-      this.listData()
-    }
+    // searchQuery(){
+    //   /*this.customParam.content.where.condition = this.search*/
+    //   this.param.content.where.condition = this.search
+    //   this.listData()
+    // }
   },
   mounted() {
     this.listData()
   },
   created () {
-    this.listData()
   },
 }
 

vue.config.js

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