Browse Source

代码上传

zhangqiOMG 2 years ago
parent
commit
37ace7f43d

+ 7 - 0
src/HDrpManagement/bankStatement/components/confirm.vue

@@ -11,6 +11,13 @@
     </el-dropdown>
 
     <el-dialog :visible.sync="drawer" width="60%" append-to-body>
+      <div class="flex-align-center">
+        <el-input 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          v-model="param.content.where.condition" 
+          placeholder="请输入搜索内容" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>&nbsp;
+      </div>
       <el-table
         ref="multipleTable"
         :data="tableData"

+ 3 - 1
src/HDrpManagement/dispatch/modules/edit.vue

@@ -155,10 +155,12 @@ export default {
         "id": "20221009155803",
         "content": {
           "nocache":true,
+          "pageNumber":1,
+          "pageSize":9999999,
           "sys_enterpriseid":this.data.sys_enterpriseid,
           "where":{
             "condition":"",
-            "workaddress":0
+            "workaddress":1
           }
         }
       })

+ 2 - 2
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -57,8 +57,8 @@
           width="180">
           <template slot-scope="scope">
             <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
-            <span v-else>{{scope.row.qty}}</span>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.row.qty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+            <!-- <span v-else>{{scope.row.qty}}</span> -->
           </template>
         </el-table-column>
         <el-table-column

+ 7 - 5
src/SDrpManagement/agentOrder/modules/edit.vue

@@ -289,15 +289,17 @@ export default {
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       const res = await this.$api.requested({
-        "id": "20230220002602",
+        "id": "20221009155803",
         "content": {
-          "pageSize":100,
+          "nocache":true,
           "pageNumber":1,
+          "pageSize":9999999,
           "sys_enterpriseid":this.data.sys_enterpriseid,
-          "where": {
-              "condition": ""
+          "where":{
+            "condition":"",
+            "workaddress":1
           }
-        },
+        }
       })
       this.receiveAddresslist = res.data
     },

+ 9 - 5
src/SDrpManagement/salerOrder/modules/edit.vue

@@ -295,13 +295,17 @@ export default {
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       const res = await this.$api.requested({
-        "id": "20230220002602",
+        "id": "20221009155803",
         "content": {
-          "pageSize":100,
-          "where": {
-              "condition": ""
+          "nocache":true,
+          "pageNumber":1,
+          "pageSize":9999999,
+          "sys_enterpriseid":this.data.sys_enterpriseid,
+          "where":{
+            "condition":"",
+            "workaddress":1
           }
-        },
+        }
       })
       this.receiveAddresslist = res.data
     },

+ 7 - 9
src/template/selectAgent/index.vue

@@ -51,10 +51,9 @@
           <el-pagination
             background
             small
-            @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
-            :current-page="currentPage"
-            :page-size="param.content.pageSize"
+            :current-page="customParam ? customParam.content.pageNumber : param.content.pageNumber"
+            :page-size="customParam ? customParam.content.pageSize : param.content.pageSize"
             layout="total, prev, pager, next, jumper"
             :total="total">
           </el-pagination>
@@ -106,14 +105,13 @@ export default {
         this.param.content.where.condition = data
       }
     },
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.param.content.pageSize = val
-      this.listData()
-    },
     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) {