From 87311bc2d8e755685efb021e059cabadb53d17ea Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Fri, 19 Jan 2024 14:55:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/qcInventory/index.vue       |  59 ++++----
 .../quality/qcInventory/selectLLWorkOrder.vue | 138 ------------------
 .../quality/qcInventory/selectMaterial.vue    |   3 +-
 3 files changed, 33 insertions(+), 167 deletions(-)
 delete mode 100644 src/views/quality/qcInventory/selectLLWorkOrder.vue

diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index 0a6e315..97c5355 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -140,7 +140,7 @@
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
 			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
-			<el-table-column label="库存时间" align="center" prop="incomeTime" width="180">
+			<el-table-column label="入库时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
@@ -225,9 +225,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="来料批次号" prop="incomeBatchNo">
-							<el-input v-model="form.incomeBatchNo" placeholder="请输入库存批次号">
-								<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
+						<el-form-item label="批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
 							</el-input>
 						</el-form-item>
 					</el-col>
@@ -235,7 +234,9 @@
 				<el-row>
 			        <el-col :span="8">
 				   		<el-form-item label="物料名称" prop="materialName">
-							<el-input v-model="form.materialName" placeholder="请选择物料名称"/>
+							<el-input v-model="form.materialName" placeholder="请选择物料名称">
+								<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
+							</el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
@@ -243,9 +244,14 @@
 							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
-						<el-form-item label="检测地点" prop="checkLoc">
-							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
+					<el-col :span="8">
+						<el-form-item label="入库时间" prop="incomeTime">
+							<el-date-picker clearable
+								v-model="form.incomeTime"
+								type="datetime"
+								value-format="yyyy-MM-dd HH:mm:ss"
+								placeholder="请选择入库时间">
+							</el-date-picker>
 						</el-form-item>
 					</el-col>
 				</el-row>	
@@ -288,6 +294,11 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
+					<el-col :span="8">	
+						<el-form-item label="检测地点" prop="checkLoc">
+							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
+						</el-form-item>
+					</el-col>
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -296,10 +307,10 @@
 			</div>
 		</el-dialog>
 			<!--订单选择弹窗-->
-			<ItemSelectWorkOrder
-				ref="itemSelectWorkOrder"
-				@onSelected="onSelectWorkOrder"
-			></ItemSelectWorkOrder>
+			<ItemSelectMaterial
+				ref="itemSelectMaterial"
+				@onSelected="onSelectMaterial"
+			></ItemSelectMaterial>
 			<!--供应商选择弹窗-->
 			<ItemSelectSupplier
 				ref="itemSelectSupplier"
@@ -321,7 +332,7 @@
 <script>
 import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, delQcInventory } from "@/api/quality/qcInventory.js";
 import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectWorkOrder from "./selectLLWorkOrder";
+import ItemSelectMaterial from "./selectMaterial.vue"
 import ItemSelectSupplier from "./selectSupplier";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
@@ -329,7 +340,7 @@ import moment from 'moment';
 import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Inventory",
-	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
+	components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
 	dicts: ["unit","check_status","check_result"],
 	data() {
 		return {
@@ -390,7 +401,7 @@ export default {
                   { required: true, message: "检验类型不能为空", trigger: "blur" } 
 				],
 				incomeBatchNo: [
-					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
+					{ required: true, message: "批次号不能为空", trigger: "blur" }
 				],
 				orderNo: [
 					{ required: true, message: "订单号不能为空", trigger: "blur" }
@@ -599,20 +610,14 @@ export default {
 		},
 
         /**工单选择弹出框**/
-		handleSelectWorkOrder() {
-		  this.$refs.itemSelectWorkOrder.showFlag = true;
+		handleSelectMaterial() {
+		  this.$refs.itemSelectMaterial.showFlag = true;
 		},
 		//工单选择确认
-		onSelectWorkOrder(obj) {
-           this.form.orderNo = obj.orderNo;
-		   this.form.materialName = obj.materialName;
-		   this.form.materialCode = obj.materialCode;
-           this.form.quality = obj.quality;
-		   this.form.incomeBatchNo = obj.incomeBatchNo;
-		   this.form.unit = obj.unit;
-		   this.form.supplierCode = obj.supplierCode;
-		   this.form.supplierName = obj.supplierName;
-		   this.form.incomeTime = obj.incomeTime;
+		onSelectMaterial(obj) {
+			console.log(obj);
+		   this.form.materialName = obj.name;
+		   this.form.materialCode = obj.code;
 		},
 
 		/**供应商选择弹出框**/
diff --git a/src/views/quality/qcInventory/selectLLWorkOrder.vue b/src/views/quality/qcInventory/selectLLWorkOrder.vue
deleted file mode 100644
index 2d87cf1..0000000
--- a/src/views/quality/qcInventory/selectLLWorkOrder.vue
+++ /dev/null
@@ -1,138 +0,0 @@
-<template>
-  <el-dialog title="来料DN单号选择"
-    v-if="showFlag"
-    :visible.sync="showFlag"
-    :modal= false
-    width="1000px"
-  >
-    <el-row :gutter="20">
-
-      <el-col :span="24" :xs="24">
-        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
-          <el-form-item label="来料单号">
-            <el-input
-              v-model="queryParams.orderNo"
-              placeholder="来料单号"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-        <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
-          <el-table-column width="50" align="center" type="selection"/>
-          <el-table-column label="id"  align="left"  prop="recordId" width="100" v-if="false"/>
-          <el-table-column label="来料单号"  align="left"  prop="orderNo" width="180"/>
-          <el-table-column label="质检状态"  align="left"  prop="qualityStatus" width="100"/>
-          <el-table-column label="批次号"  align="left" prop="incomeBatchNo" width="120"/>
-          <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
-          <el-table-column label="产品名称"  align="left" prop="materialName" width="180"/>
-          <el-table-column label="供应商编码"  align="left" prop="supplierCode" :show-overflow-tooltip="true" />
-          <el-table-column label="供应商名称"  align="left" prop="supplierName" :show-overflow-tooltip="true" />
-          <el-table-column label="排产数量"  align="left" prop="quality" width="100" />
-          <el-table-column label="单位"  align="left" prop="unit" :show-overflow-tooltip="true" />
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitLLOrderForm">确 定</el-button>
-              <el-button @click="showFlag=false">取 消</el-button>
-       </div>
-  </el-dialog>
-</template>
-<script>
-
-import { getLLWorkOrder } from "@/api/quality/income";
-export default {
-  name: "itemSelectWorkOrder",
-  data() {
-    return {
-      showFlag:false,
-      // 选中数组
-      selectedRows: {},
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // BOM产品表格数据
-      itemList: null,
-
-      //树名称
-      bomCode: undefined,
-      defaultProps: {
-        id: "id",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        workorderCode: ''
-      },
-      selectionRow:{}
-    };
-  },
-  created() {
-    this.getList();
-  },
-
-  methods: {
-
-    /** 查询表格列表*/
-    getList() {
-      this.loading = true;
-      getLLWorkOrder(this.queryParams).then(response => {
-          this.itemList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-    
-    // 多选框选中数据
-		handleBomSelectionChange(selection) {
-
-      if(selection.length>1){
-        this.$modal.msgSuccess("只能选一个");
-      }
-
-			this.selectionRow = selection[0]
-		},
-
-
-    submitLLOrderForm() {
-      this.$emit('onSelected', this.selectionRow);
-      this.showFlag = false;
-    }
-  }
-};
-</script>
diff --git a/src/views/quality/qcInventory/selectMaterial.vue b/src/views/quality/qcInventory/selectMaterial.vue
index 07aab87..00c9794 100644
--- a/src/views/quality/qcInventory/selectMaterial.vue
+++ b/src/views/quality/qcInventory/selectMaterial.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="BOM物料选择"
+  <el-dialog title="物料选择"
     v-if="showFlag"
     :visible.sync="showFlag"
     :modal= false
@@ -144,7 +144,6 @@ export default {
 
 		},
 
-
     submitBomForm() {
       this.selectedRows.code = this.ids;
       this.selectedRows.name = this.idsName;