修改订单管理分类查询传参数据

zkqy-ui/src/views/orderMange/index.vue

@@ -110,8 +110,16 @@
           >导出
         </el-button>
       </el-col>
+
+      <right-toolbar
+        style="float: right"
+        :showCount.sync="showCount"
+        :showSearch.sync="showSearch"
+        :counts="true"
+        @queryTable="pageList"
+      ></right-toolbar>
       <el-radio-group
-        style="margin-left: 100px"
+        style="float: right; margin-right: 100px"
         v-model="orderType"
         size="mini"
         @change="orderTypeChange"
@@ -120,12 +128,6 @@
         <el-radio-button :label="1">库存</el-radio-button>
         <el-radio-button :label="2">生产</el-radio-button>
       </el-radio-group>
-      <right-toolbar
-        :showCount.sync="showCount"
-        :showSearch.sync="showSearch"
-        :counts="true"
-        @queryTable="pageList"
-      ></right-toolbar>
     </el-row>
     <el-table
       v-loading="loading"
@@ -712,7 +714,7 @@ export default {
             trigger: "change",
           },
         ],
-        customerName: [
+        saleCustomNo: [
           {
             required: true,
             message: "请选择客户",
@@ -1058,7 +1060,8 @@ export default {
           let getListFun = orderType == 0 ? unionListTableData : getTableList1;
           if (orderType != 0) {
             this.queryParams.conditionMap = {
-              orderType,
+              columnName: "order_type",
+              columnValue: orderType,
             };
           }
           getListFun(this.queryParams).then(async (res) => {
@@ -2309,19 +2312,19 @@ export default {
                       " "
                     )}</td>
                 </tr>
-                <tr align="center"> 
+                <tr align="center">
                     <td width="300px" colspan="2">客户名称：</td>
                     <td width="300px" colspan="2">${customerName}</td>
                     <td width="150px">联系人：</td>
                     <td width="150px">${contactPerson}</td>
                 </tr>
-                <tr align="center"> 
+                <tr align="center">
                     <td colspan="2">客户地址：</td>
                     <td colspan="2">${customAddress}</td>
                     <td>客户国别：</td>
                     <td>${customCountryType}</td>
                 </tr>
-                <tr align="center"> 
+                <tr align="center">
                     <td colspan="2">预计下单时间：</td>
                     <td colspan="2">${saleOrderEstimatedTime.replace(
                       "T",
@@ -2332,7 +2335,7 @@ export default {
                 </tr>
                 <tr align="center">
                     <td colspan="6">货品明细</td>
-                </tr>             
+                </tr>
                 <tr align="center">
                     <td width="300px" colspan="2">品名</td>
                     <td width="150px">数量/kg</td>