返退单修改,账户余额排序

src/HDrpManagement/AccountMoney/index.vue

@@ -1,23 +1,39 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="list" 
-      formPath="AccountMoney" 
-      tableName="accountMoneyTable" 
+    <basicLayout
+      ref="list"
+      formPath="AccountMoney"
+      tableName="accountMoneyTable"
       :apiId="{query:20221008145903}"
       :options="options"
       @listCreate="list">
+      <template #setSort>
+
+        <el-dropdown @command="handleCommand">
+          <span class="el-dropdown-link">
+            <i class="el-icon-sort inline-16" ></i>
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item command="默认">默认</el-dropdown-item>
+            <el-dropdown-item command="账户余额升序">账户余额升序</el-dropdown-item>
+            <el-dropdown-item command="账户余额降序">账户余额降序</el-dropdown-item>
+            <el-dropdown-item command="信用额度升序">信用额度升序</el-dropdown-item>
+            <el-dropdown-item command="信用额度降序">信用额度降序</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+
+      </template>
       <template #custom>
 <!--        <div class="mt-10">
           <label class="search__label">企业:</label>
-          <el-select 
+          <el-select
               class="inline-16"
-              v-model="sys_enterpriseid" 
-              placeholder="企业筛选" 
-              size="small" 
-              @change="enterpriseChange" 
-              clearable 
+              v-model="sys_enterpriseid"
+              placeholder="企业筛选"
+              size="small"
+              @change="enterpriseChange"
+              clearable
               @clear="enterpriseChange($refs.list.param.content.where.sys_enterpriseid='')"
             >
               <el-option
@@ -30,13 +46,13 @@
         </div>-->
         <div class="mt-10">
           <span class="search__label">账户类型: </span>
-            <el-select 
+            <el-select
               class="inline-16"
-              v-model="accountType" 
-              placeholder="账户类型筛选" 
-              size="small" 
-              @change="accountChange" 
-              clearable 
+              v-model="accountType"
+              placeholder="账户类型筛选"
+              size="small"
+              @change="accountChange"
+              clearable
               @clear="accountChange($refs.list.param.content.where.accountname='')"
             >
               <el-option
@@ -111,7 +127,7 @@ export default {
       })
       this.accountTypeList = res.data
       console.log(this.accountTypeList);
-      
+
     },
     /* 企业筛选 */
     enterpriseChange () {
@@ -121,10 +137,63 @@ export default {
     accountChange () {
       this.$refs.list.param.content.where.accountname = this.accountType
       this.$refs.list.listData()
+    },
+    /*筛选*/
+    handleCommand(command) {
+      let sort = [
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 133,
+          sortname: "默认"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 139,
+          sortname: "账户余额升序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 143,
+          sortname: "账户余额降序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 140,
+          sortname: "信用额度升序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 144,
+          sortname: "信用额度降序"
+        }
+      ]
+      switch (command) {
+        case '默认':
+          this.$refs.list.param.content.sort = [sort[0]]
+              break
+        case '账户余额升序':
+          this.$refs.list.param.content.sort = [sort[1]]
+          break
+        case '账户余额降序':
+          this.$refs.list.param.content.sort = [sort[2]]
+          break
+        case '信用额度升序':
+          this.$refs.list.param.content.sort = [sort[3]]
+          break
+        case '信用额度降序':
+          this.$refs.list.param.content.sort = [sort[4]]
+          break
+      }
+      this.$refs.list.listData()
     }
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/dispatch/index.vue

@@ -1,14 +1,14 @@
 
 <template>
   <div>
-    <basicLayout 
-      ref="basicLayout" 
+    <basicLayout
+      ref="basicLayout"
       :oldFormPath="{
         add:'HDrpManagement/dispatch/modules'
       }"
       :tableClassName="tableClassName"
       tableName="dispatchTable"
-      idName="sa_dispatchid" 
+      idName="sa_dispatchid"
       :apiId="{query:20221114135403,del:20221114135503}"
       :fixRightData="['remarks']"
       :fixLeftData="['billno','status']"
@@ -44,6 +44,14 @@
           <!-- <label class="search__label" >发货日期:</label> -->
           <el-input size="small" v-model="value" placeholder="根据品号或订单号查询" @keydown.native.enter="queryList" clearable></el-input>
         </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" agentinfo?agentinfo.length > 0?'':'':'el-icon-search'" v-model="agentinfo" @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="remarks?remarks.length > 0?'':'':'el-icon-search'" v-model="remarks" @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'STATUS'">
@@ -65,15 +73,15 @@
     </basicLayout>
   </div>
 </template>
-  
+
   <script>
   /**
    * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
    * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
    * @param {string} tableName 开发端配置的表格名称
    * @param {String} idName 数据主id名称
-   * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
-   * @param {Array} options:{label:描述,value:值} 
+   * @param {object} apiId:{query:查询的接口id,del:删除的接口id}
+   * @param {Array} options:{label:描述,value:值}
    */
   export default {
     data () {
@@ -81,8 +89,9 @@
         options:[],
         dateSelect:[],
         value:'',
-        status:''
-        
+        status:'',
+        agentinfo:'',
+        remarks:''
       }
     },
     methods:{
@@ -104,6 +113,8 @@
       queryList () {
         this.$refs.basicLayout.param.content.pageNumber = 1
         this.$refs.basicLayout.param.content.where.param = this.value
+        this.$refs.basicLayout.param.content.where.agentinfo = this.agentinfo
+        this.$refs.basicLayout.param.content.where.remarks = this.remarks
         this.$refs.basicLayout.listData()
       },
       tableClassName (row) {
@@ -115,7 +126,7 @@
       }
     }
   }
-  
+
   </script>
   <style>
-  </style>
+  </style>

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -35,7 +35,7 @@
                 title="确定关闭当前行吗？"
                 @confirm="cancelRow(scope.data)"
             >
-              <el-button slot="reference" type="text" size="mini" :disabled="data.STATUS !== '复核'">关闭</el-button>
+              <el-button slot="reference" type="text" size="mini" :disabled="data.STATUS !== '复核' || scope.data.isclose == 1">关闭</el-button>
             </el-popconfirm>
           </template>
         </tableLayout>

src/HDrpManagement/orderManage/details/index.vue

@@ -151,12 +151,12 @@ export default {
           }
         })
         this.mainData = res.data
-        
+
         this.changeDataStructure()
         this.orderreviewtype()
         re()
       })
-      
+
     },
     changeDataStructure() {
       let that = this
@@ -284,7 +284,7 @@ export default {
           label:'方案编码',
           value:this.mainData.promnum
         })
-        
+
       }
     },
     // 监听切换数据,上一页,下一页
@@ -337,7 +337,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       });
     },
     // 特殊订单
@@ -362,7 +362,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       });
     },
     // 反审核订单
@@ -385,7 +385,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       });
     },
     async onRebanck () {
@@ -508,7 +508,7 @@ export default {
             "sa_orderid":this.mainData.sa_orderid
           }
         })
-        
+
         this.tool.showMessage(res,()=>{
           this.queryMainData()
         })
@@ -516,7 +516,7 @@ export default {
         this.$message({
           type: 'info',
           message: '已取消'
-        });          
+        });
       })
     },
     rowClick (row) {
@@ -533,4 +533,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

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

@@ -39,7 +39,7 @@
           <p><span :style="scope.row.isonsale == 1?{color:'green'}:{color:'red'}">{{scope.row.isonsale == 1?'上架':'下架'}}</span></p>
         </template>
       </el-table-column>
-      
+
       <el-table-column
         prop="itemname"
         label="品名"
@@ -155,7 +155,7 @@ export default {
         default:
           this.params.id = 20221109153502
           break;
-      } 
+      }
       this.params.content.sa_orderid = this.$route.query.id
       const res = await this.$api.requested(this.params)
       this.tableData = res.data.filter(e=>{
@@ -209,9 +209,10 @@ export default {
     onConfirm () {
       this.params.content.where.condition = ''
       this.$emit('onConfirm',this.tableSelectData,true)
-      this.tableSelectData.forEach(v => {
+      this.tableSelectData = []
+     /* this.tableSelectData.forEach(v => {
         this.tableData.splice(this.tableData.findIndex(j => j.itemid == v.itemid),1)
-      })
+      })*/
     },
     onSuccess () {
       this.tableData=[];
@@ -255,4 +256,4 @@ height: calc(100% - 20px) !important;
 /deep/.el-dialog__header {
   display: none !important;
 }
-</style>
+</style>

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

@@ -42,7 +42,7 @@
           label="品号"
           width="100"
           fixed="left">
-        </el-table-column>   
+        </el-table-column>
         <el-table-column
           prop="qty"
           label="数量"
@@ -397,13 +397,13 @@ export default {
         })
       }
       this.loading = false
-     
+
     },
     async dateChangeNeed(val){
       const res = await this.$api.requested({
         "id": 20230104143802,
         "content": {
-          "sa_orderid": this.data.sa_orderid, 
+          "sa_orderid": this.data.sa_orderid,
           "needdate": this.value2
         },
       })
@@ -426,7 +426,7 @@ export default {
       const res = await this.$api.requested({
        "id": 20230104143102,
         "content": {
-          "sa_orderid": this.$route.query.id, 
+          "sa_orderid": this.$route.query.id,
           "deliverydate": this.value2
         },
       })
@@ -437,6 +437,7 @@ export default {
     },
     // 订单添加产品
     async onConfirm (data,isupload) {
+      this.drawer = false
       if (isupload) {
         const res = await this.$api.requested({
           "id": 20221109093602,
@@ -457,6 +458,7 @@ export default {
       }
       this.listData()
       this.$emit('onSuccess')
+      this.$refs.addpro.tableSelectData = []
     },
     async queryStock (val) {
       const res = await this.$api.requested({
@@ -489,7 +491,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.listData()
       })
-      
+
     },
     discountrateValidate () {
       if (this.discountrate > 1) {
@@ -518,7 +520,7 @@ export default {
         this.$emit('onSuccess')
         this.listData()
       })
-      
+
     },
     async reloadPrice (row) {
       const res = await this.$api.requested({
@@ -532,9 +534,9 @@ export default {
         this.$emit('onSuccess')
         this.listData()
       })
-      
+
     }
-    
+
   },
   mounted () {
     this.listData()
@@ -556,4 +558,4 @@ export default {
 body .el-table th.gutter{
 display: table-cell!important;
 }
-</style>
+</style>

src/HDrpManagement/orderManage/index.vue

@@ -1,10 +1,10 @@
 
 <template>
   <div>
-    <basicLayout 
+    <basicLayout
       ref="basicLayout"
-      tableName="orderTable" 
-      idName="sa_orderid" 
+      tableName="orderTable"
+      idName="sa_orderid"
       :apiId="{query:20230105143002,del:20221108152102}"
       :oldFormPath="{add:'HDrpManagement/orderManage/modules'}"
       :options="options"
@@ -66,6 +66,14 @@
               clearable>
           </el-date-picker>
         </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon="where.agentinfo?where.agentinfo.length > 0?'':'':'el-icon-search'" v-model="where.agentinfo" @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="where.remarks?where.remarks.length > 0?'':'':'el-icon-search'" v-model="where.remarks" @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
@@ -116,9 +124,11 @@ export default {
         "invoicestatus":'',
         "isreturn": '',
         "ischange": '',
+        "agentinfo":'',
+        "remarks":''
       },
       dateSelect:[]
-      
+
     }
   },
   methods:{
@@ -173,4 +183,4 @@ export default {
   margin-bottom:10px;
   display: inline-block;
 }
-</style>
+</style>

src/HDrpManagement/payvoucher/index.vue

@@ -42,6 +42,14 @@
               clearable>
           </el-date-picker>
         </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
       </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'amount'">
@@ -94,7 +102,9 @@ export default {
         status:'',
         accountname:'',
         begindate:'',
-        enddate:''
+        enddate:'',
+        agentinfo:'',
+        remarks:''
       },
       accountNameList:[],
       dateSelect:''
@@ -153,4 +163,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

src/HDrpManagement/recvoucher/index.vue

@@ -14,29 +14,43 @@
       <template #titleRight>
         <importExcel style="margin-left:10px" @onSuccess="onSuccess"></importExcel>
       </template>
-      <div slot="custom" style="display:flex">
-        <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
-          <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
-        </el-select>
-        <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
-        <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
-          <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
-        </el-select>
-        <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
-        <el-date-picker
-            style="margin-right: 24px !important;"
-            size="small"
-            @change="selectChange"
-            value-format="yyyy-MM-dd"
-            v-model="dateSelect"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            clearable>
-        </el-date-picker>
-      </div>
+      <template #custom>
+        <div class="mt-10">
+          <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
+          <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
+            <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
+          <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+            <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
+          </el-select>
+        </div>
+        <div class="mt-10">
+          <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+        <div class="mt-10">
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'amount'">
           <span :style="+scope.data.column.data.amount >= 0 ? 'color:green' : 'color:red'">{{ tool.formatAmount(scope.data.column.data.amount,2) }}</span>
@@ -89,7 +103,9 @@ export default {
         status:'',
         accountname:'',
         begindate:'',
-        enddate:''
+        enddate:'',
+        agentinfo:'',
+        remarks:''
       },
       accountNameList:[],
       dateSelect:''
@@ -148,4 +164,4 @@ export default {
 </script>
 
 <style scoped>
-</style>
+</style>

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

@@ -32,6 +32,7 @@
             <slot name="titleRight"></slot>
           </div>
           <div class="normal-margin">
+            <slot name="setSort"></slot>
             <setColumn :layout="layout" @changeColumn="changeColumn"></setColumn>
             <setFixed :data="tableLayout" @onFixedClick="onFixedClick"></setFixed>
             <i class="el-icon-refresh" @click="listData(param.content.pageNumber = 1,param.content.where.condition = '')"></i>