Browse Source

入库确认

lilei 11 tháng trước cách đây
mục cha
commit
6965699a87

+ 9 - 5
src/views/financialManagement/warehousingConfirmation/list.vue

@@ -23,15 +23,15 @@
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="业务单号">
               <a-form-item label="业务单号">
-                <a-input id="warehousingConfirmationList-bizNo" v-model.trim="queryParam.bizNo" allowClear placeholder="请输入业务单号"/>
+                <a-input id="warehousingConfirmationList-putBizNo" v-model.trim="queryParam.putBizNo" allowClear placeholder="请输入业务单号"/>
               </a-form-item>
               </a-form-item>
             </a-col>
             </a-col>
             <a-col :md="6" :sm="24">
             <a-col :md="6" :sm="24">
               <a-form-item label="入库类型">
               <a-form-item label="入库类型">
                 <v-select
                 <v-select
-                  v-model="queryParam.incomingType"
-                  id="warehousingConfirmationList-incomingType"
-                  code="PUT_CONFIRM_STATE"
+                  v-model="queryParam.putBizType"
+                  id="warehousingConfirmationList-putBizType"
+                  code="PUT_STOCK_TYPE"
                   placeholder="请选择入库类型"
                   placeholder="请选择入库类型"
                   allowClear></v-select>
                   allowClear></v-select>
               </a-form-item>
               </a-form-item>
@@ -135,6 +135,8 @@ export default {
       loading: false,
       loading: false,
       queryParam: { //  查询条件
       queryParam: { //  查询条件
         stockPutNo: '', //  入库单号
         stockPutNo: '', //  入库单号
+        putBizNo: '', //  业务单号
+        putBizType: undefined, //  入库类型
         auditState: undefined, //  状态
         auditState: undefined, //  状态
         warehouseSn: undefined // 仓库
         warehouseSn: undefined // 仓库
       },
       },
@@ -169,7 +171,7 @@ export default {
       const arr = [
       const arr = [
         { title: '入库时间', dataIndex: 'putTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库时间', dataIndex: 'putTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库单号', scopedSlots: { customRender: 'stockPutNo' }, width: '12%', align: 'center' },
         { title: '入库单号', scopedSlots: { customRender: 'stockPutNo' }, width: '12%', align: 'center' },
-        { title: '业务单号', dataIndex: 'stockPutNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '业务单号', dataIndex: 'putBizNo', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '商户名称', dataIndex: 'providerName', align: 'left', width: '18%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '商户名称', dataIndex: 'providerName', align: 'left', width: '18%', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '入库数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库数量', dataIndex: 'productTotalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库类型', dataIndex: 'putBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -197,6 +199,8 @@ export default {
     //  重置
     //  重置
     resetSearchForm () {
     resetSearchForm () {
       this.queryParam.stockPutNo = ''
       this.queryParam.stockPutNo = ''
+      this.queryParam.putBizNo = ''
+      this.queryParam.putBizType = undefined
       this.queryParam.auditState = undefined
       this.queryParam.auditState = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.warehouseSn = undefined
       this.$refs.table.refresh(true)
       this.$refs.table.refresh(true)

+ 7 - 7
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -3,33 +3,33 @@
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="table-page-search-wrapper" style="margin:0">
     <div class="table-page-search-wrapper" style="margin:0">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
       <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
-        <a-row :gutter="15">
-          <a-col :md="4" :sm="24">
+        <a-row :gutter="15" type="flex">
+          <a-col flex="1">
             <a-form-item label="出库仓库" prop="warehouseSn">
             <a-form-item label="出库仓库" prop="warehouseSn">
               <chooseWarehouse id="salesEdit-warehouseSn" ref="warehouse" v-model="queryParam.warehouseSn" @load="warehouseLoad"></chooseWarehouse>
               <chooseWarehouse id="salesEdit-warehouseSn" ref="warehouse" v-model="queryParam.warehouseSn" @load="warehouseLoad"></chooseWarehouse>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="产品编码" prop="productCode">
             <a-form-item label="产品编码" prop="productCode">
               <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
               <a-input id="salesEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="2">
             <a-form-item label="产品名称" prop="productName">
             <a-form-item label="产品名称" prop="productName">
               <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
               <a-input id="salesEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="品牌">
             <a-form-item label="品牌">
               <ProductBrand id="salesEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
               <ProductBrand id="salesEdit-productBrandSn" v-model="queryParam.productBrandSn"></ProductBrand>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24">
+          <a-col flex="1">
             <a-form-item label="产品分类">
             <a-form-item label="产品分类">
               <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
               <productTypeAll placeholder="请选择产品分类" @change="changeProductType" v-model="productType" id="salesEdit-productType"></productTypeAll>
             </a-form-item>
             </a-form-item>
           </a-col>
           </a-col>
-          <a-col :md="4" :sm="24" style="margin-bottom: 10px;">
+          <a-col flex="2" style="margin-bottom: 10px;">
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
             <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="salesEdit-refresh">查询</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
             <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesEdit-reset">重置</a-button>
             <a-button
             <a-button