手持机

ruoyi-ui/src/views/in/receive/add/index.vue

@@ -6,7 +6,7 @@
       </div>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item :label="$t('receiveStockinAdd.warehouse')" prop="warehouseId">
               <el-select v-model="form.warehouseId" :placeholder="$t('receiveStockinAdd.selectWarehouse')">
                 <el-option
@@ -18,16 +18,14 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item :label="$t('receiveStockinAdd.supplier')" prop="supplierId">
-              <el-select v-model="form.supplierId" :placeholder="$t('receiveStockinAdd.selectSupplier')">
-                <el-option
-                  v-for="item in supplierOptions"
-                  :key="item.id"
-                  :label="item.simpleName"
-                  :value="item.supplierNo"
-                />
-              </el-select>
+              <el-input 
+                 v-model="form.supplierName" 
+                 :placeholder="$t('receiveStockinAdd.selectSupplier')"
+                 @click.native="openSupplierSelector"
+                 readonly
+               />
             </el-form-item>
           </el-col>
           <!--          <el-col :span="8">
@@ -35,7 +33,7 @@
                         <el-input v-model="form.batchNo" placeholder="请输入批次号" />
                       </el-form-item>
                     </el-col>-->
-          <el-col :span="8">
+          <el-col :span="6">
             <el-form-item :label="$t('receiveStockinAdd.remark')" prop="remark">
               <el-input v-model="form.remark" :placeholder="$t('receiveStockinAdd.inputRemark')"/>
             </el-form-item>
@@ -202,6 +200,67 @@
         <el-button @click="upload.open = false">{{ $t('receiveStockinAdd.cancel') }}</el-button>
       </div>
     </el-dialog>
+    
+    <!-- 供应商选择对话框 -->
+    <el-dialog title="选择供应商" :visible.sync="supplierDialog" width="800px" append-to-body>
+      <el-form :model="supplierQueryParams" ref="supplierQueryForm" :inline="true">
+        <el-form-item label="供应商编号" prop="supplierNo">
+          <el-input
+            v-model="supplierQueryParams.supplierNo"
+            placeholder="请输入供应商编号"
+            clearable
+            size="small"
+            @keyup.enter.native="handleSupplierQuery"
+          />
+        </el-form-item>
+        <el-form-item label="供应商名称" prop="supplierName">
+          <el-input
+            v-model="supplierQueryParams.supplierName"
+            placeholder="请输入供应商名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleSupplierQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleSupplierQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetSupplierQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      
+      <el-table
+        ref="supplierTable"
+        v-loading="supplierLoading"
+        :data="supplierList"
+        border
+        @row-click="handleSupplierRowClick"
+        highlight-current-row
+        style="width: 100%"
+      >
+        <el-table-column type="index" label="序号" width="50" align="center" />
+        <el-table-column label="供应商编号" align="center" prop="supplierNo" />
+        <el-table-column label="供应商名称" align="center" prop="supplierName" />
+        <el-table-column label="简称" align="center" prop="simpleName" />
+        <el-table-column label="是否可用" align="center" prop="useable">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.is_available" :value="scope.row.useable"/>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination
+        v-show="supplierTotal > 0"
+        :total="supplierTotal"
+        :page.sync="supplierQueryParams.pageNum"
+        :limit.sync="supplierQueryParams.pageSize"
+        @pagination="getSupplierList"
+      />
+      
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="confirmSelectSupplier">确定</el-button>
+        <el-button @click="cancelSelectSupplier">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -215,13 +274,14 @@ import {listWarehouse} from "@/api/bas/warehouse"
 
 export default {
   name: "InAdd",
-  dicts: ['sys_normal_disable', 'is_active', 'storage_cond'],
+  dicts: ['sys_normal_disable', 'is_active', 'storage_cond', 'is_available'],
   data() {
     return {
       // 表单参数
       form: {
         warehouseId: undefined,
         supplierId: undefined,
+        supplierName: undefined,
         remark: undefined,
         totalQuantity: 0,
         totalAmount: 0,
@@ -245,6 +305,24 @@ export default {
       warehouseOptions: [],
       // 供应商选项
       supplierOptions: [],
+      // 供应商选择对话框
+      supplierDialog: false,
+      // 供应商列表
+      supplierList: [],
+      // 选中的供应商
+      selectedSupplier: null,
+      // 供应商总数
+      supplierTotal: 0,
+      // 供应商加载状态
+      supplierLoading: false,
+      // 供应商查询参数
+      supplierQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        supplierNo: null,
+        supplierName: null
+      
+      },
       // 物料列表
       productList: [],
       // 物料选择对话框
@@ -311,12 +389,64 @@ export default {
         this.productLoading = false;
       });
     },
-    /** 获取供应商列表 */
+    /** 获取供应商列表（下拉框选项） */
     getSupplierList() {
       listBasSupplier().then(response => {
         this.supplierOptions = response.rows;
       });
     },
+    
+    /** 打开供应商选择对话框 */
+    openSupplierSelector() {
+      this.getSupplierListForDialog();
+      this.supplierDialog = true;
+    },
+    
+    /** 获取供应商列表（对话框数据） */
+    getSupplierListForDialog() {
+      this.supplierLoading = true;
+      listBasSupplier(this.supplierQueryParams).then(response => {
+        this.supplierList = response.rows;
+        this.supplierTotal = response.total;
+        this.supplierLoading = false;
+      });
+    },
+    
+    /** 供应商查询 */
+    handleSupplierQuery() {
+      this.supplierQueryParams.pageNum = 1;
+      this.getSupplierListForDialog();
+    },
+    
+    /** 重置供应商查询 */
+    resetSupplierQuery() {
+      this.resetForm("supplierQueryForm");
+      // this.supplierQueryParams.useable = "0";
+      this.handleSupplierQuery();
+    },
+    
+    /** 供应商行点击事件 */
+    handleSupplierRowClick(row) {
+      this.selectedSupplier = row;
+      this.$refs.supplierTable.setCurrentRow(row);
+    },
+    
+    /** 确认选择供应商 */
+    confirmSelectSupplier() {
+      if (!this.selectedSupplier) {
+        this.$modal.msgError("请选择一个供应商");
+        return;
+      }
+      this.form.supplierId = this.selectedSupplier.supplierNo;
+      this.form.supplierName = this.selectedSupplier.supplierName;
+      this.supplierDialog = false;
+    },
+    
+    /** 取消选择供应商 */
+    cancelSelectSupplier() {
+      this.selectedSupplier = null;
+      this.supplierDialog = false;
+    },
 
     /** 添加物料按钮操作 */
     handleAddProduct() {
@@ -393,6 +523,7 @@ export default {
       this.form = {
         warehouseId: undefined,
         supplierId: undefined,
+        supplierName: undefined,
         remark: undefined,
         totalQuantity: 0,
         totalAmount: 0,
@@ -402,6 +533,8 @@ export default {
       // 重置计数器
       this.totalQuantity = 0;
       this.totalAmount = 0;
+      // 清空选中的供应商
+      this.selectedSupplier = null;
       // 重置表单校验结果
       this.$refs["form"].resetFields();
 

ruoyi-ui/src/views/in/receive/index.vue

@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item :label="$t('inReceiveStockin.materialDesc')" prop="stockSource"><!--物料描述-->
+      <el-form-item :label="$t('inReceiveStockin.materialDesc')" prop="materialDesc"><!--物料描述-->
         <el-input
           v-model="queryParams.materialDesc"
           :placeholder="$t('inReceiveStockin.inputMaterialDesc')"
@@ -36,7 +36,6 @@
         <el-select
           v-model="queryParams.status"
           :placeholder="$t('inReceiveStockin.selectStatus')"
-          clearable
           @change="handleQuery"
         >
           <el-option
@@ -327,7 +326,8 @@ export default {
         departmentNo: null,
         customerNo: null,
         classNo: null,
-        supplierNo: null
+        supplierNo: null,
+        materialDesc: null
       },
       queryDetailParams: {
         pageNum: 1,
@@ -391,7 +391,8 @@ export default {
         departmentNo: null,
         customerNo: null,
         classNo: null,
-        supplierNo: null
+        supplierNo: null,
+        materialDesc: null
       }
       this.resetForm("form")
     },