xzt-539,377,430

src/views/purchase/DemandSummary/add.vue

@@ -178,11 +178,11 @@ export default {
     },
     back() {
       this.$emit('jugislist', true)
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.$emit('refresh', queryParams)
+      // let queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }
+      // this.$emit('refresh', queryParams)
     },
     // 如果需要回显则调用详情接口
     getDetails(row) {

src/views/purchase/DemandSummary/index.vue

@@ -1,233 +1,234 @@
 <template>
   <div id="demandSummary">
     <div v-if="isList">
-      <el-form class="search_area" label-width="100px">
-        <el-row :gutter="10">
-          <el-col :span="1.5">
-            <el-form-item label="行状态">
-              <el-select multiple v-model="queryParams.rowStatus" size="small" style="width: 200px" clearable>
-                <el-option v-for="dict in dict.type.sys_row_status" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="采购员">
-              <el-select clearable size="small" v-model="queryParams.buyer" @focus="chooseRefer('CONTACTS_PARAM', true, '采购员')" style="width: 200px">
-                <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="品类">
-              <el-select
-              v-model="queryParams.materialClassifyFourName"
-              size="small"
-              clearable
-              @focus="chooseTreeRefer('MATERIALCLASSIFY_PARAM', false, '选择品类')"
-              style="width: 200px"
-              >
-              <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.name" />
-            </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="" label-width="20px">
-              <el-button type="primary" size="small" icon="el-icon-search" plain @click="search">搜索</el-button>
-              <el-button size="small" icon="el-icon-refresh" plain @click="reset">重置</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <CollapseTransition>
-        <div v-show="expanded">
+      <el-card>
+        <el-form class="search_area" label-width="100px">
           <el-row :gutter="10">
             <el-col :span="1.5">
-              <el-form-item label="生产厂家">
-                <el-input
-                v-model="queryParams.manufacturer"
-                size="small"
-                clearable
-                style="width: 200px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="预测分类">
-                <el-select v-model="queryParams.forecastClassification" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="dict in dict.type.predictive_classify" :key="dict.value" :label="dict.label" :value="dict.label">
+              <el-form-item label="行状态">
+                <el-select multiple v-model="queryParams.rowStatus" size="small" style="width: 200px" clearable>
+                  <el-option v-for="dict in dict.type.sys_row_status" :key="dict.value" :label="dict.label" :value="dict.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
-              <el-form-item label="审核人">
-                <el-select clearable size="small" v-model="queryParams.puManagerAuditor" @focus="chooseRefer('CONTACTS_PARAM', true, '审核人')" style="width: 200px">
-                  <el-option v-for="item in auditOptions" :key="item.id" :label="item.name" :value="item.code" />
+              <el-form-item label="采购员">
+                <el-select clearable size="small" v-model="queryParams.buyer" @focus="chooseRefer('CONTACTS_PARAM', true, '采购员')" style="width: 200px">
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
                 </el-select>
               </el-form-item>
             </el-col>
-            <!-- <el-col :span="1.5">
-              <el-form-item label="周期单位">
-                <el-select v-model="queryParams.periodUnit" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="dict in dict.type.sys_period_unit" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-          </el-row>
-
-          <el-row :gutter="10">
-            <!-- <el-col :span="1.5">
-              <el-form-item label="转请购单号">
-                <el-input
-                v-model="queryParams.zqgdh"
-                size="small"
-                placeholder=""
-                clearable
-                style="width: 200px"
-                />
-              </el-form-item>
-            </el-col> -->
-            <!-- <el-col :span="1.5">
-              <el-form-item label="业务部门">
-                <el-select clearable size="small" v-model="queryParams.departmentName" @focus="chooseRefer('DEPT_PARAM', true, '业务部门')" style="width: 200px">
-                  <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-          </el-row>
-
-          <el-row :gutter="10">
             <el-col :span="1.5">
-              <el-form-item label="注册人">
-                <el-input
-                v-model="queryParams.registrant"
+              <el-form-item label="品类">
+                <el-select
+                v-model="queryParams.materialClassifyFourName"
                 size="small"
                 clearable
+                @focus="chooseTreeRefer('MATERIALCLASSIFY_PARAM', false, '选择品类')"
                 style="width: 200px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="业务类型">
-                <el-select v-model="queryParams.businessType" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
+                >
+                <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.name" />
+              </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
-              <el-form-item label="单据来源">
-                <el-select v-model="queryParams.billSource" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
-                  </el-option>
-                </el-select>
+              <el-form-item label="" label-width="20px">
+                <el-button type="primary" size="small" icon="el-icon-search" plain @click="search">搜索</el-button>
+                <el-button size="small" icon="el-icon-refresh" plain @click="reset">重置</el-button>
               </el-form-item>
             </el-col>
           </el-row>
 
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-form-item label="需求客户">
-                <el-select clearable size="small" v-model="queryParams.customer" @focus="chooseRefer('CUSTOMER_PARAM', true, '需求客户')" style="width: 200px">
-                  <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="末级供应仓库">
-                <el-select clearable size="small" v-model="queryParams.lastWarehouse" @focus="chooseRefer('WAREHOUSE_PARAM', true, '末级供应仓库')" style="width: 200px">
-                  <el-option v-for="item in lastWarehouseOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="末级供应库位">
-                <el-select clearable size="small" v-model="queryParams.lastAllocation" @focus="chooseRefer('ALLOCATION_PARAM', true, '末级供应库位', queryParams.lastWarehouse)" style="width: 200px">
-                  <el-option v-for="item in lastAllocationOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <!-- <el-col :span="1.5">
-              <el-form-item label="转请购时间">
-                <el-select v-model="queryParams.ywlx" size="small" style="width: 200px" clearable>
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-          </el-row>
+          <CollapseTransition>
+          <div v-show="expanded">
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="生产厂家">
+                  <el-input
+                  v-model="queryParams.manufacturer"
+                  size="small"
+                  clearable
+                  style="width: 200px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="预测分类">
+                  <el-select v-model="queryParams.forecastClassification" size="small" style="width: 200px" clearable>
+                    <el-option
+                      v-for="dict in dict.type.predictive_classify" :key="dict.value" :label="dict.label" :value="dict.label">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="审核人">
+                  <el-select clearable size="small" v-model="queryParams.puManagerAuditor" @focus="chooseRefer('CONTACTS_PARAM', true, '审核人')" style="width: 200px">
+                    <el-option v-for="item in auditOptions" :key="item.id" :label="item.name" :value="item.code" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-form-item label="周期单位">
+                  <el-select v-model="queryParams.periodUnit" size="small" style="width: 200px" clearable>
+                    <el-option
+                      v-for="dict in dict.type.sys_period_unit" :key="dict.value" :label="dict.label" :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
 
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-form-item label="物料编码">
-                <el-input clearable size="small" v-model="queryParams.names" @focus="chooseMaterial" style="width: 200px">
-                  <el-button size="small" slot="append" icon="el-icon-more" @click="chooseMaterial"></el-button>
-                </el-input>
-                <el-input v-show="false" v-model="queryParams.materialCode"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="默认采购组织">
-                <el-select clearable size="small" v-model="queryParams.purchaseOrg" @focus="chooseRefer('ORG_PARAM', true, '默认采购组织')" style="width: 200px">
-                  <el-option v-for="item in orgOptions" :key="item.id" :label="item.name" :value="item.id" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="需求日期">
-                <el-date-picker
-                  v-model="queryParams.demandDate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
+            <el-row :gutter="10">
+              <!-- <el-col :span="1.5">
+                <el-form-item label="转请购单号">
+                  <el-input
+                  v-model="queryParams.zqgdh"
                   size="small"
+                  placeholder=""
+                  clearable
                   style="width: 200px"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+                  />
+                </el-form-item>
+              </el-col> -->
+              <!-- <el-col :span="1.5">
+                <el-form-item label="业务部门">
+                  <el-select clearable size="small" v-model="queryParams.departmentName" @focus="chooseRefer('DEPT_PARAM', true, '业务部门')" style="width: 200px">
+                    <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
 
-          <el-row :gutter="10">
-            <el-col :span="1.5">
-              <el-form-item label="采购需求单号">
-                <el-input
-                v-model.trim="queryParams.code"
-                size="small"
-                clearable
-                style="width: 200px"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="1.5">
-              <el-form-item label="审批结束日期">
-                <el-date-picker
-                  v-model="queryParams.approverFinishTime"
-                  type="date"
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="注册人">
+                  <el-input
+                  v-model="queryParams.registrant"
+                  size="small"
                   clearable
-                  value-format="yyyy-MM-dd"
+                  style="width: 200px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="业务类型">
+                  <el-select v-model="queryParams.businessType" size="small" style="width: 200px" clearable>
+                    <el-option
+                      v-for="dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="单据来源">
+                  <el-select v-model="queryParams.billSource" size="small" style="width: 200px" clearable>
+                    <el-option
+                      v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="需求客户">
+                  <el-select clearable size="small" v-model="queryParams.customer" @focus="chooseRefer('CUSTOMER_PARAM', true, '需求客户')" style="width: 200px">
+                    <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="末级供应仓库">
+                  <el-select clearable size="small" v-model="queryParams.lastWarehouse" @focus="chooseRefer('WAREHOUSE_PARAM', true, '末级供应仓库')" style="width: 200px">
+                    <el-option v-for="item in lastWarehouseOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="末级供应库位">
+                  <el-select clearable size="small" v-model="queryParams.lastAllocation" @focus="chooseRefer('ALLOCATION_PARAM', true, '末级供应库位', queryParams.lastWarehouse)" style="width: 200px">
+                    <el-option v-for="item in lastAllocationOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <!-- <el-col :span="1.5">
+                <el-form-item label="转请购时间">
+                  <el-select v-model="queryParams.ywlx" size="small" style="width: 200px" clearable>
+                    <el-option
+                      v-for="item in options"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col> -->
+            </el-row>
+
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="物料编码">
+                  <el-input clearable size="small" v-model="queryParams.names" @focus="chooseMaterial" style="width: 200px">
+                    <el-button size="small" slot="append" icon="el-icon-more" @click="chooseMaterial"></el-button>
+                  </el-input>
+                  <el-input v-show="false" v-model="queryParams.materialCode"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="默认采购组织">
+                  <el-select clearable size="small" v-model="queryParams.purchaseOrg" @focus="chooseRefer('ORG_PARAM', true, '默认采购组织')" style="width: 200px">
+                    <el-option v-for="item in orgOptions" :key="item.id" :label="item.name" :value="item.id" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="需求日期">
+                  <el-date-picker
+                    v-model="queryParams.demandDate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                    style="width: 200px"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="采购需求单号">
+                  <el-input
+                  v-model.trim="queryParams.code"
                   size="small"
+                  clearable
                   style="width: 200px"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </div>
-        </CollapseTransition>
-      </el-form>
-      <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="审批结束日期">
+                  <el-date-picker
+                    v-model="queryParams.approverFinishTime"
+                    type="date"
+                    clearable
+                    value-format="yyyy-MM-dd"
+                    size="small"
+                    style="width: 200px"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          </CollapseTransition>
+        </el-form>
+        <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
     
-      <el-card>
+      
         <div class="btn_grooup">
           <el-button type="primary" size="small" @click="editList">编辑</el-button>
           <el-button type="danger" size="small" v-if="!lineDisable" @click="cancelEdit">取消编辑</el-button>
@@ -254,7 +255,7 @@
           fit
           show-summary
           :summary-method="getSummaries"
-          max-height="480"
+          max-height="550"
           @selection-change="handleSelectionChange"
           :key="isUpdate"
         >
@@ -345,6 +346,7 @@
         </el-table>
 
         <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="1"
@@ -761,4 +763,8 @@ export default {
 .hang ::v-deep .el-form-item__content{
   margin-left: 0px !important;
 }
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
 </style>

src/views/purchase/PurchaseDemandList/add.vue

@@ -602,7 +602,7 @@ export default {
     },
     // 获取预留数量
     getYLSL(scope) {
-      scope.row.reservedQty = scope.row.reservedProportion.replace('%', '') / 100 * scope.row.qty
+      scope.row.reservedQty = Math.ceil(scope.row.reservedProportion.replace('%', '') / 100 * scope.row.qty)
     },
     copy() {
       this.$modal.msgSuccess("复制成功");
@@ -790,11 +790,11 @@ export default {
     },
     back() {
       this.$emit('jugislist', true)
-      let queryParams = {
-        pageNum: 1,
-        pageSize: 10
-      }
-      this.$emit('refresh', queryParams)
+      // let queryParams = {
+      //   pageNum: 1,
+      //   pageSize: 10
+      // }
+      // this.$emit('refresh', queryParams)
     },
     // 如果需要回显则调用详情接口
     getDetails(row) {

src/views/purchase/PurchaseDemandList/index.vue

@@ -1,115 +1,130 @@
 <template>
   <div id="PurchaseDemandList">
     <div v-if="isList">
-      <el-form class="search_area" label-width="100px">
-        <el-row :gutter="10">
-          <el-col :span="1.5">
-            <el-form-item label="单据编码">
-              <el-input
-                v-model.trim="queryParams.code"
-                size="small"
-                clearable
-                style="width: 200px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="需求客户">
-              <el-select clearable size="small" v-model="queryParams.customer" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')" style="width: 200px">
-                <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="是否客户指定">
-              <el-select clearable v-model="queryParams.isProcess" size="small" style="width: 200px" placeholder="请选择">
-                <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="" label-width="20px">
-              <el-button type="primary" size="small" icon="el-icon-search" plain @click="searchList">搜索</el-button>
-              <el-button size="small" icon="el-icon-refresh" plain @click="resetList">重置</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      <CollapseTransition>
-        <div v-show="expanded">
-        <el-row :gutter="10">
-          <el-col :span="1.5">
-            <el-form-item label="需求人员">
-              <el-select clearable size="small" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
-                <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="单据来源">
-              <el-select clearable v-model="queryParams.source" size="small" style="width: 200px">
-                <el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="业务类型">
-              <el-select clearable v-model="queryParams.billType" size="small" style="width: 200px">
-                <el-option v-for=" dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
+      <el-card>
+        <el-form class="search_area" label-width="100px">
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="单据编码">
+                <el-input
+                  v-model.trim="queryParams.code"
+                  size="small"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="需求客户">
+                <el-select clearable size="small" v-model="queryParams.customer" @focus="chooseOrg('CUSTOMER_PARAM', true, '选择客户')" style="width: 200px">
+                  <el-option v-for="item in customerOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="是否客户指定">
+                <el-select clearable v-model="queryParams.isProcess" size="small" style="width: 200px" placeholder="请选择">
+                  <el-option
+                    v-for="item in options"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="" label-width="20px">
+                <el-button type="primary" size="small" icon="el-icon-search" plain @click="searchList">搜索</el-button>
+                <el-button size="small" icon="el-icon-refresh" plain @click="resetList">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        <CollapseTransition>
+          <div v-show="expanded">
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="需求人员">
+                <el-select clearable size="small" v-model="queryParams.demandPersonal" @focus="chooseOrg('CONTACTS_PARAM', true, '需求人员')" style="width: 200px">
+                  <el-option v-for="item in personOptions" :key="item.id" :label="item.name" :value="item.code" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="单据来源">
+                <el-select clearable v-model="queryParams.source" size="small" style="width: 200px">
+                  <el-option v-for="dict in dict.type.sys_bill_source" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="业务类型">
+                <el-select clearable v-model="queryParams.billType" size="small" style="width: 200px">
+                  <el-option v-for=" dict in dict.type.sys_business" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
 
-        <el-row :gutter="10">
-          <el-col :span="1.5">
-            <el-form-item label="需求部门">
-              <el-select clearable v-model="queryParams.demandDept" size="small" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
-                <el-option
-                  v-for="item in deptOptions"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="需求日期">
-              <el-date-picker
-                v-model="queryParams.demandDate"
-                type="date"
-                clearable
-                value-format="yyyy-MM-dd"
-                size="small"
-                style="width: 200px"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="备注">
-              <el-input
-                v-model.trim="queryParams.remark"
-                size="small"
-                clearable
-                style="width: 200px"
-              />
+          <el-row :gutter="10">
+            <el-col :span="1.5">
+              <el-form-item label="需求部门">
+                <el-select clearable v-model="queryParams.demandDept" size="small" :disabled="disable" @focus="chooseOrg('DEPT_PARAM', true, '需求部门')" style="width: 200px">
+                  <el-option
+                    v-for="item in deptOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
-        </el-row>
-        </div>
-      </CollapseTransition>
-      </el-form>
-      <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
+            <el-col :span="1.5">
+              <el-form-item label="需求日期">
+                <el-date-picker
+                  v-model="queryParams.demandDate"
+                  type="date"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  size="small"
+                  style="width: 200px"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="备注">
+                <el-input
+                  v-model.trim="queryParams.remark"
+                  size="small"
+                  clearable
+                  style="width: 200px"
+                />
+                </el-form-item>
+              </el-col>
+          </el-row>
 
-      <el-card>
+          <el-row :gutter="10">
+            <el-col>
+              <el-form-item label="物料编码">
+                <el-input
+                  v-model.trim="queryParams.materialCode"
+                  size="small"
+                  clearable
+                  style="width: 200px"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          </div>
+        </CollapseTransition>
+        </el-form>
+        <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider>
+
+        
         <div class="btn_grooup">
           <el-button type="primary" size="small" @click="addDivision">新增</el-button>
 
@@ -139,7 +154,7 @@
         <el-table 
           :data="tableList" 
           fit
-          max-height="350"
+          max-height="550"
           @selection-change="handleSelectionChange"
         >
           <el-table-column show-overflow-tooltip type="selection" width="55" />
@@ -173,6 +188,7 @@
         </el-table>
 
         <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="1"
@@ -269,6 +285,7 @@ export default {
         demandDept: '',
         demandDate: '',
         remark: '',
+        materialCode: '',
         pageNum: 1,
         pageSize: 5
       },
@@ -353,6 +370,7 @@ export default {
         demandDept: '',
         demandDate: '',
         remark: '',
+        materialCode: '',
         pageNum: 1,
         pageSize: 5
       }
@@ -557,4 +575,8 @@ export default {
 .lines {
   margin-top: 0;
 }
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
 </style>

src/views/purchase/transferOrder/index.vue

@@ -1,92 +1,93 @@
 <template>
   <div id="transferOrder">
     <div v-if="isList">
-      <el-form class="search_area" label-width="120px">
-        <el-row :gutter="10">
-          <el-col :span="1.5">
-            <el-form-item label="调出库存组织">
-              <el-select clearable size="small" v-model="queryParams.deliveryInventoryOrg" @focus="chooseRefer('ORG_PARAM', true, '调出库存组织')" style="width: 200px">
-                <el-option v-for="item in chuOrgOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="单据日期">
-              <el-date-picker
-               style="width: 200px"
-               size="small"
-               clearable
-               value-format="yyyy-MM-dd"
-                v-model="queryParams.billDate"
-                type="date">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="订单类型">
-              <el-select v-model="queryParams.billType" size="small" style="width: 200px" clearable>
-                <el-option v-for="dict in dict.type.sys_allot_billtype" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="调入库存组织">
-              <el-select clearable size="small" v-model="queryParams.storageInventoryOrg" @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')" style="width: 200px">
-                <el-option v-for="item in ruOrgOptions" :key="item.id" :label="item.name" :value="item.id" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="单据号">
-              <el-input
-                v-model.trim="queryParams.code"
-                size="small"
-                clearable
-                style="width: 200px"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="1.5">
-            <el-form-item label="" label-width="20px">
-              <el-button type="primary" size="small" icon="el-icon-search" plain @click="searchList">搜索</el-button>
-              <el-button size="small" icon="el-icon-refresh" plain @click="resetList">重置</el-button>
-            </el-form-item>
-          </el-col>
-        </el-row>
-
-        <!-- <CollapseTransition>
-        <div v-show="expanded">
+      <el-card>
+        <el-form class="search_area" label-width="120px">
           <el-row :gutter="10">
             <el-col :span="1.5">
-              <el-form-item label="物料编码">
-                <el-input
-                v-model="queryParams.code"
+              <el-form-item label="调出库存组织">
+                <el-select clearable size="small" v-model="queryParams.deliveryInventoryOrg" @focus="chooseRefer('ORG_PARAM', true, '调出库存组织')" style="width: 200px">
+                  <el-option v-for="item in chuOrgOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="单据日期">
+                <el-date-picker
+                style="width: 200px"
                 size="small"
-                placeholder=""
                 clearable
-                style="width: 200px"
-                />
+                value-format="yyyy-MM-dd"
+                  v-model="queryParams.billDate"
+                  type="date">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="订单类型">
+                <el-select v-model="queryParams.billType" size="small" style="width: 200px" clearable>
+                  <el-option v-for="dict in dict.type.sys_allot_billtype" :key="dict.value" :label="dict.label" :value="dict.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="1.5">
               <el-form-item label="调入库存组织">
+                <el-select clearable size="small" v-model="queryParams.storageInventoryOrg" @focus="chooseRefer('ORG_PARAM', true, '调入库存组织')" style="width: 200px">
+                  <el-option v-for="item in ruOrgOptions" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="单据号">
                 <el-input
-                v-model="queryParams.storageInventoryOrg"
-                size="small"
-                placeholder=""
-                clearable
-                style="width: 200px"
+                  v-model.trim="queryParams.code"
+                  size="small"
+                  clearable
+                  style="width: 200px"
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="1.5">
+              <el-form-item label="" label-width="20px">
+                <el-button type="primary" size="small" icon="el-icon-search" plain @click="searchList">搜索</el-button>
+                <el-button size="small" icon="el-icon-refresh" plain @click="resetList">重置</el-button>
+              </el-form-item>
+            </el-col>
           </el-row>
-        </div>
-        </CollapseTransition> -->
-      </el-form>
+
+          <!-- <CollapseTransition>
+          <div v-show="expanded">
+            <el-row :gutter="10">
+              <el-col :span="1.5">
+                <el-form-item label="物料编码">
+                  <el-input
+                  v-model="queryParams.code"
+                  size="small"
+                  placeholder=""
+                  clearable
+                  style="width: 200px"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="1.5">
+                <el-form-item label="调入库存组织">
+                  <el-input
+                  v-model="queryParams.storageInventoryOrg"
+                  size="small"
+                  placeholder=""
+                  clearable
+                  style="width: 200px"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          </CollapseTransition> -->
+        </el-form>
       <!-- <el-divider class="lines"><i style="cursor: pointer;" :class="expanded?'el-icon-arrow-up':'el-icon-arrow-down'" @click="drop"></i></el-divider> -->
 
-      <el-card>
+      
         <div class="btn_grooup">
           <el-button type="primary" size="small" @click="addOrder">新增</el-button>
         </div>
@@ -147,6 +148,7 @@
         </el-table-column>
         </el-table>
         <el-pagination
+          background
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page="1"
@@ -477,4 +479,8 @@ export default {
 .lines {
   margin-top: 0;
 }
+.el-pagination {
+  margin-top: 10px;
+  text-align: right;
+}
 </style>