调拨入参修改

src/views/stock/allot/columns.js

@@ -11,25 +11,16 @@ export default [
     _slot_: 'status',
     width: '130px'
   },
-  {
-    prop: 'company_name',
-    label: '申请人部门',
-    minWidth: '150px'
-  },
-  {
-    prop: 'apply_name',
-    label: '申请人',
-    width: '80'
-  },
+
   {
     prop: 'out_company_name',
-    label: '出库仓库业务公司',
+    label: '出库公司名称',
     width: '172'
   },
 
   {
     prop: 'out_companyNo',
-    label: '出库仓库业务公司编号',
+    label: '出库公司编号',
     width: '158'
   },
   // {
@@ -46,7 +37,7 @@ export default [
   {
     prop: 'name',
     label: '出库仓库名称',
-    width: '95'
+    width: '175'
   },
 
   {
@@ -57,13 +48,13 @@ export default [
 
   {
     prop: 'in_company_name',
-    label: '入库仓库业务公司',
+    label: '入库公司名称',
     width: '172'
   },
 
   {
     prop: 'in_companyNo',
-    label: '入库仓库业务公司编号',
+    label: '入库公司编号',
     width: '158'
   },
   // {
@@ -80,7 +71,7 @@ export default [
   {
     prop: 'wsm_in_name',
     label: '入库仓库名称',
-    width: '95'
+    width: '175'
 
   },
   {
@@ -90,6 +81,16 @@ export default [
 
   },
 
+  {
+    prop: 'apply_name',
+    label: '申请人',
+    width: '80'
+  },
+  {
+    prop: 'company_name',
+    label: '申请人部门',
+    minWidth: '150px'
+  },
   {
     prop: 'addtime',
     label: '创建时间',

src/views/stock/allot/index.vue

@@ -25,28 +25,7 @@
           <div style="width: 100%">
             <el-row style="padding: 0px 0 0 80px">
               <el-col :span="24">
-                <el-col :span="4" style="width: 130px">
-                  <el-select
-                    v-model="parmValue.status"
-                    :size="searchSize"
-                    style="width: 100%"
-                    placeholder="调拨状态"
-                    @change="
-                      pageInfo.curr = 1;
-                      parmValue.page = 1;
-                      searchList();
-                    "
-                  >
-                    <el-option
-                      v-for="item in statusOptions"
-                      :key="item.id"
-                      :label="item.label"
-                      :value="item.id"
-                    >
-                    </el-option>
-                  </el-select>
-                </el-col>
-                <el-col :span="6" style="width: 303px; padding: 0 0 0 10px">
+                <el-col :span="6" style="width: 293px">
                   <period-date-picker
                     :type="1"
                     :width="'135px'"
@@ -56,7 +35,15 @@
                     @timeReturned="handleTime"
                   />
                 </el-col>
-                <el-col :span="4" style="width: 140px; padding: 0 0 0 10px">
+                <el-col :span="4" style="width: 263px; padding: 0 0 0 10px">
+                  <el-input
+                    :size="searchSize"
+                    v-model="parmValue.allot_code"
+                    :maxlength="40"
+                    placeholder="调拨编号"
+                  />
+                </el-col>
+                <el-col :span="4" style="width: 180px; padding: 0 0 0 10px">
                   <el-input
                     :size="searchSize"
                     v-model="parmValue.company_name"
@@ -69,14 +56,6 @@
                     placeholder="创建人部门"
                   ></el-input>
                 </el-col>
-                <el-col :span="4" style="width: 175px; padding: 0 0 0 10px">
-                  <el-input
-                    :size="searchSize"
-                    v-model="parmValue.allot_code"
-                    :maxlength="40"
-                    placeholder="调拨编号"
-                  />
-                </el-col>
 
                 <el-col :span="3" style="width: 66px; float: right">
                   <el-button
@@ -102,9 +81,34 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0px">
-              <el-col :span="4" style="width: 125px">
-                <el-dropdown @command="handleClick($event)" :size="searchSize">
-                  <el-button :size="searchSize">
+              <el-col :span="4" style="width: 173px">
+                <el-select
+                  v-model="parmValue.status"
+                  :size="searchSize"
+                  style="width: 100%"
+                  placeholder="调拨状态"
+                  @change="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
+                >
+                  <el-option
+                    v-for="item in statusOptions"
+                    :key="item.id"
+                    :label="item.label"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </el-col>
+              <el-col :span="4" style="width: 200px; padding: 0 0 0 10px">
+                <el-dropdown
+                  @command="handleClick($event)"
+                  :size="searchSize"
+                  style="width: 100%"
+                >
+                  <el-button :size="searchSize" style="width: 100%">
                     {{ sselect }}
                     <i class="el-icon-arrow-down el-icon--right" :size="searchSize"></i>
                   </el-button>
@@ -118,26 +122,7 @@
                   </el-dropdown-menu>
                 </el-dropdown>
               </el-col>
-              <!-- <el-col :span="12" style="width: 260px; padding: 0 0 0 10px">
-                <search-work-company
-                  :value="parmValue.companyNo"
-                  :names="''"
-                  :size="searchSize"
-                  :is-detail="id !== 'add'"
-                  :placeholder="'业务公司'"
-                  @searchChange="companyNoChange"
-                />
-              </el-col> -->
-              <!-- <el-col :span="4" style="width: 260px; padding: 0 0 0 10px">
-                <search-supplier
-                  :size="searchSize"
-                  :value="parmValue.supplierNo"
-                  :placeholder="'公司名称'"
-                  :disabled="false"
-                  :isDetail="false"
-                  @searchChange="supplierChange"
-                />
-              </el-col> -->
+
               <el-col :span="4" style="width: 262px; padding: 0 0 0 10px">
                 <search-stock
                   :size="searchSize"
@@ -234,10 +219,10 @@ export default {
       return action ?? [];
     },
   },
-  watch:{
-    sselect(){
+  watch: {
+    sselect() {
       this.searchList();
-    }
+    },
   },
   data() {
     return {
@@ -253,9 +238,9 @@ export default {
         { id: "6", label: "调拨驳回" },
       ],
       statusList: statusList,
-      options: ["按出库方筛选", "按入库方筛选"],
+      options: ["按出库方和入库方公司筛选", "只按出库方公司筛选", "只按入库方公司筛选"],
       loading: true,
-      sselect: "按出库方筛选",
+      sselect: "按出库方和入库方公司筛选",
       showModel: false,
       isDetail: false,
       modelId: 0,
@@ -300,7 +285,7 @@ export default {
       //多选条件
       this.sselect = this.parmValue.sselect;
     } else {
-      this.sselect = "按出库方筛选";
+      this.sselect = "按出库方和入库方公司筛选";
     }
 
     this.searchList();
@@ -340,7 +325,7 @@ export default {
     },
     // 重置搜索框
     restSearch() {
-      this.sselect = "按出库方筛选";
+      this.sselect = "按出库方和入库方公司筛选";
       this.supplierNo = "";
       // 表格 - 分页
       this.pageInfo = {
@@ -384,21 +369,21 @@ export default {
       await this.searchList();
     },
     openModal(id, isDetail) {
-      if(id === 'add' && !this.currentCompany){
-        this.$message.warning('请选择一家业务公司')
-        return
+      if (id === "add" && !this.currentCompany) {
+        this.$message.warning("请选择一家业务公司");
+        return;
       }
-      
+
       this.showModel = true;
       this.modelId = id;
       this.isDetail = isDetail;
     },
     onCompanyChangeInner() {
-      this.stockNo
-      this.pageInfo.curr = 1
-      this.parmValue.page = 1
-      this.parmValue.companyNo = this.currentCompany
-      this.searchList()
+      this.stockNo;
+      this.pageInfo.curr = 1;
+      this.parmValue.page = 1;
+      this.parmValue.companyNo = this.currentCompany;
+      this.searchList();
     },
     // 获取调拨列表
     async searchList() {
@@ -415,15 +400,20 @@ export default {
       let stockNo = model.stockNo.length == 1 ? model.stockNo[0] : "";
       delete model["supplierNo"];
       delete model["stockNo"];
-      model.wsm_out = this.sselect == "按出库方筛选" ? stockNo : "";
-      model.wsm_in = this.sselect != "按出库方筛选" ? stockNo : "";
+      model.out_companyNo =
+        this.sselect !== "只按入库方公司筛选" ? this.currentCompany : "";
+      model.in_companyNo =
+        this.sselect !== "只按出库方公司筛选" ? this.currentCompany : "";
+      model.wsm_out = this.sselect !== "只按入库方公司筛选" ? stockNo : "";
+      model.wsm_in = this.sselect !== "只按出库方公司筛选" ? stockNo : "";
       // model.wsm_out_supplierNo = this.sselect == "按出库方筛选" ? supplierNo : "";
       // model.wsm_in_supplierNo = this.sselect != "按出库方筛选" ? supplierNo : "";
-      const res = await asyncRequest.list(model);
-      if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      const { code, data } = await asyncRequest.list(model);
+      if (Number(code) === 0) {
+        const { list, count } = data;
+        this.tableData = list;
+        this.pageInfo.total = Number(count);
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.tableData = [];