From 6dd5b45945736870eb01162f44f8d4a9296e1ce8 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 5 Aug 2024 10:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/income.js                     |  11 ++
 src/views/mes/reportWork/index.vue            |   4 +-
 src/views/plan/workorder/index.vue            |   6 +
 src/views/quality/qcInventory/index.vue       | 131 ++++++++++--------
 src/views/quality/qcProduceAnalysis/index.vue |   2 +-
 src/views/quality/qcTableIncome/index.vue     |  10 +-
 src/views/quality/qcTableProduce/index.vue    |  42 ++----
 src/views/quality/qcTableXJ/index.vue         |  10 +-
 src/views/quality/qcTableXJAnalysis/index.vue |  27 ++--
 src/views/quality/qcWarehousing/index.vue     |   2 +-
 src/views/wms/product/index.vue               |  11 +-
 11 files changed, 147 insertions(+), 109 deletions(-)

diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 8a3883f..2e91c29 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -178,6 +178,17 @@ export function getWorkOrder(query) {
 	  params: query
 	});
   }
+
+// 查询生产过程-工单列表
+export function getPutInOrder(query) {
+	return request({
+	  url: '/quality/qcInventory/getPutInOrder',
+	  method: 'get',
+	  params: query
+	});
+  }  
+  
+
 // 查询入库订单列表
 export function getProductWorkOrder(query) {
 	return request({
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 1696377..a1a9c2b 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -439,6 +439,8 @@
 						<el-table-column label="物料名称" width="280" align="left" prop="materialName"
 							:show-overflow-tooltip="true" />
 						<el-table-column label="BOM组件用量" width="150" align="left" prop="planQuantity" />
+            <el-table-column label="单位数量" align="center" prop="erfmg" />
+            <el-table-column label="条目单位" align="center" prop="erfme" />
 						<el-table-column label="实际用量" width="150" align="left" prop="quantity"
 							:show-overflow-tooltip="true">
 							<template slot-scope="scope">
@@ -448,8 +450,6 @@
 						</el-table-column>
 						<el-table-column label="单位" width="50" align="center" prop="unit" />
 						<el-table-column label="反冲标识" align="center" prop="recoil" />
-            <el-table-column label="单位数量" align="center" prop="erfmg" />
-            <el-table-column label="条目单位" align="center" prop="erfme" />
             <el-table-column label="sap项目编码" align="center" prop="rspos" />
 						<el-table-column label="仓库" width="150" align="center" prop="warehouseCode">
 							<template slot-scope="scope">
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index f72479c..40af233 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -1816,6 +1816,12 @@ export default {
       return value;
     },
     editBatch() {
+      if(this.selectWork.status == 'w0'){
+        this.$modal.msgError("还未派发请到工单变更进行调整！");
+        return;
+      }
+      
+
       this.batchLoading = true;
       const workOrdercode = this.codes[0];
       getWorkOrderBatch(workOrdercode).then(response => {
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index 9bf3a4a..ee0aebe 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -69,17 +69,6 @@
 					v-hasPermi="['quality:qcInventory:export']"
 				>导出</el-button>
 			</el-col>
-			<el-col :span="1.5">
-				<el-button
-					type="danger"
-					plain
-					icon="el-icon-magic-stick"
-					size="mini"
-					:disabled="single"
-					@click="handleUpdate"
-					v-hasPermi="['quality:qcInventory:edit']"
-				>审核编辑</el-button>
-			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -87,16 +76,16 @@
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
-			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="100"/>
-			<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="100"/>
-			<el-table-column label="物料号" align="center" prop="materialCode" width="80"/>
-			<el-table-column label="物料名称" align="center" prop="materialName" width="100"/>
+			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
+			<!--<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="100"/>-->
+			<el-table-column label="物料号" align="center" prop="materialCode" width="120" :formatter="productCodeFormate"/>
+			<el-table-column label="物料名称" align="center" prop="materialName" width="150" :show-overflow-tooltip="true"/>
 			<el-table-column label="仓库编码" align="center" prop="supplierCode" width="90"/>
 			<el-table-column label="仓库名称" align="center" prop="supplierName" width="90"/>
-			<el-table-column label="检测地点" align="center" prop="checkLoc" width="100"/>
-			<el-table-column label="创建时间" align="center" prop="checkTime" width="100">
+			<!--<el-table-column label="检测地点" align="center" prop="checkLoc" width="100"/>-->
+			<el-table-column label="创建时间" align="center" prop="createTime" width="100">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="检测状态" align="center" prop="checkStatus" >
@@ -115,6 +104,25 @@
 				</template>
 			</el-table-column>
 			<el-table-column label="检验结果" align="center" prop="checkResult" />
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleCheckProject(scope.row)"
+						v-hasPermi="['quality:qcWarehousing:edit']"
+					>检验</el-button>
+
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-magic-stick"
+						@click="handleCheckProjectM(scope.row)"
+						v-hasPermi="['quality:qcWarehousing:editM']"
+					>审核编辑</el-button>
+				</template>
+			</el-table-column>
 		</el-table>
 
 		<pagination
@@ -147,24 +155,22 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-				   		<el-form-item label="物料名称" prop="materialName">
-							<el-input v-model="form.materialName" placeholder="请选择物料名称">
-								<el-button slot="append" @click="handleSelectMaterial" icon="el-icon-search"></el-button>
+						<el-form-item label="订单号" prop="orderNo">
+							<el-input v-model="form.orderNo" placeholder="请选择订单号" >
+								<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
-					</el-col>
-					
+					</el-col>		
 				</el-row>
 				<el-row>
-					<el-col :span="8">
-						<el-form-item label="物料号" prop="materialCode">
-							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
+				    <el-col :span="8">
+				   		<el-form-item label="物料名称" prop="materialName">
+							<el-input v-model="form.materialName" placeholder="请输入物料名称" disabled/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="批次号" prop="incomeBatchNo">
-							<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号">
-							</el-input>
+						<el-form-item label="物料号" prop="materialCode">
+							<el-input v-model="form.materialCode" placeholder="请输入物料号" disabled/>
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
@@ -174,11 +180,14 @@
 					</el-col>
 				</el-row>
 				<el-row>
+					<el-col :span="8">
+						<el-form-item label="入库数量" prop="quality">
+							<el-input v-model="form.quality" placeholder="" disabled/>
+						</el-form-item>
+					</el-col>
 					<el-col :span="8">
 						<el-form-item label="仓库名称" prop="supplierName">
-							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
-							<el-button slot="append" @click="handleSelectSupplier" icon="el-icon-search"></el-button>
-							</el-input>
+							<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
 						</el-form-item>
 					</el-col>
 				   <el-col :span="8">
@@ -200,7 +209,6 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
@@ -208,16 +216,11 @@
 				<el-button @click="cancel">取 消</el-button>
 			</div>
 		</el-dialog>
-			<!--物料选择弹窗-->
-			<ItemSelectMaterial
-				ref="itemSelectMaterial"
-				@onSelected="onSelectMaterial"
-			></ItemSelectMaterial>
-			<!--供应商选择弹窗-->
-			<ItemSelectSupplier
-				ref="itemSelectSupplier"
-				@onSelected="onSelectSupplier"
-			></ItemSelectSupplier>
+			<!--订单选择弹窗-->
+			<ItemPutInOrder
+				ref="itemSelectPutInOrder"
+				@onSelected="onSelectPutInOrder"
+			></ItemPutInOrder>
 			<!--人员选择弹窗-->
 			<ItemSelectUser
 				ref="itemSelectUser"
@@ -234,15 +237,14 @@
 <script>
 import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, delQcInventory } from "@/api/quality/qcInventory.js";
 import { getCheckTypes } from "@/api/quality/qcProduce";
-import ItemSelectMaterial from "./selectMaterial.vue"
-import ItemSelectSupplier from "./selectSupplier";
+import ItemPutInOrder from "./selectPutInOrder.vue";
 import ItemSelectUser from "../qcIncome/selectUser.vue";
 import ItemSelectProject from "../qcIncome/checkProjectType.vue";
 import moment from 'moment';
 import { getDefectTypeListByDefectType } from "@/api/quality/defectType.js";
 export default {
 	name: "Inventory",
-	components: { ItemSelectMaterial,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
+	components: {ItemPutInOrder,ItemSelectUser,ItemSelectProject},
 	dicts: ["unit","check_status","check_result"],
 	data() {
 		return {
@@ -333,12 +335,17 @@ export default {
 		};
 	},
 	created() {
-		this.getDate();
+		//this.getDate();
 		this.getList();
 		this.getCheckTypes();
 		this.handleDefectType();
 	},
 	methods: {
+		productCodeFormate(row, column, cellValue){
+			if(cellValue != null){
+				return cellValue.slice(7,18);  //返回值
+			}
+		},
 		/****/
 		getCheckTypes() {
            	getCheckTypes('inventory').then(response => {
@@ -364,12 +371,12 @@ export default {
 		/** 查询库存检验列表 */
 		getList() {
 			this.loading = true;
-      console.log("--------"+this.queryParams)
+
 			if(this.queryParams.incomeTimeArray!=null && this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}else{
-        this.queryParams.incomeTimeStart = null;
+                this.queryParams.incomeTimeStart = null;
 				this.queryParams.incomeTimeEnd = null;
 			}
 
@@ -522,14 +529,19 @@ export default {
 		   this.form.materialCode = obj.code;
 		},
 
-		/**供应商选择弹出框**/
-		handleSelectSupplier() {
-		  this.$refs.itemSelectSupplier.showFlag = true;
+        /**工单选择弹出框**/
+		handleSelectWorkOrder() {
+		  this.$refs.itemSelectPutInOrder.showFlag = true;
 		},
-		//供应商选择确认
-		onSelectSupplier(obj) {
-           this.form.supplierCode = obj.code;
-		   this.form.supplierName = obj.name;
+		//工单选择确认
+		onSelectPutInOrder(obj) {
+           this.form.orderNo = obj.orderNo;
+		   this.form.materialName = obj.materialName;
+		   this.form.materialCode = obj.materialCode;
+           this.form.quality = obj.quality;
+		   this.form.incomeTime = obj.incomeTime;
+		   this.form.supplierName = obj.supplierName;//仓库编码
+		   this.form.supplierCode = obj.supplierCode;//仓库名称
 		},
 
 		/**人员选择弹出框**/
@@ -561,7 +573,12 @@ export default {
 			getDefectTypeListByDefectType(defectType).then(response => {
 				this.defectTypeList = response.rows;
 			});
-		}
+		},
+		//检验项目弹窗(二次编辑)
+		handleCheckProjectM(row){
+			this.$refs.itemSelectProject.showFlag = true;
+			this.$refs.itemSelectProject.init(row,'inventory');
+		},
 	}
 };
 </script>
diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
index 8e7cbe5..1aa37c8 100644
--- a/src/views/quality/qcProduceAnalysis/index.vue
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -87,7 +87,7 @@
 
 		<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="单位编码" align="center" prop="supplierCode" width="80"/>
+			<!--<el-table-column label="单位编码" align="center" prop="supplierCode" width="80"/>-->
 			<el-table-column prop="supplierName" label="单位名称" width="100" align="center"/>
 			<el-table-column prop="orderNo" label="订单编码" width="130" align="center"
 			:formatter="orderCodeFormate"
diff --git a/src/views/quality/qcTableIncome/index.vue b/src/views/quality/qcTableIncome/index.vue
index 7900d41..9c84f0d 100644
--- a/src/views/quality/qcTableIncome/index.vue
+++ b/src/views/quality/qcTableIncome/index.vue
@@ -4,6 +4,7 @@
 			<el-form-item label="来料月份" prop="incomeTimeYM">
 				<el-date-picker
 				v-model="queryParams.incomeTimeYM"
+				format="yyyy-MM"
 				type="month"
 				placeholder="选择月">
 				</el-date-picker>
@@ -85,6 +86,7 @@
 <script>
 import { getIncomeTableList} from "@/api/quality/qcTable";
 import ItemSelectSupplier from "./selectSupplier.vue";
+import moment from 'moment';
 export default {
 	name: "RfidProcess",
 	components: {ItemSelectSupplier},
@@ -145,9 +147,12 @@ export default {
 			}
 		};
 	},
-	created() {
+	mounted(){
 		this.getDate();
 		this.getList();
+	},
+	created() {
+		
 	},
 	methods: {
 
@@ -167,6 +172,9 @@ export default {
 		/** 查询列表 */
 		getList() {
 			this.loading = true;
+            if(this.queryParams.incomeTimeYM!=null){
+				this.queryParams.yearMonth = moment(this.queryParams.incomeTimeYM).format('YYYY-MM');
+			}
 			getIncomeTableList(this.queryParams).then(response => {
 				this.incomeList = response.rows;
 				this.total = response.total;
diff --git a/src/views/quality/qcTableProduce/index.vue b/src/views/quality/qcTableProduce/index.vue
index 2900904..083efac 100644
--- a/src/views/quality/qcTableProduce/index.vue
+++ b/src/views/quality/qcTableProduce/index.vue
@@ -113,7 +113,7 @@ export default {
 
 	methods: {
 		getWorkcenterList(){
-			
+
             getWorkcenterList().then(data => {
 				this.options = data;
 			});
@@ -132,7 +132,7 @@ export default {
 			var m = dd.getMonth() + 1;//获取当前月份的日期
 			var d = dd.getDate();
 			return y + "-" + m;
-		},	
+		},
 		/** 搜索按钮操作 */
 		handleQuery() {
 			this.getList();
@@ -160,37 +160,25 @@ export default {
 					tooltip: {
 						trigger: 'axis'
 					},
-					legend: {
-						data: data.legendData//['Email', 'Union Ads', 'Video Ads', 'Direct', 'Search Engine']
-					},
-					grid: {
-						left: '3%',
-						right: '4%',
-						bottom: '3%',
-						containLabel: true
-					},
-					toolbox: {
-						feature: {
-							saveAsImage: {}
-						}
-					},
 					xAxis: {
 						type: 'category',
 						boundaryGap: false,
 						data: data.xAxis//['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
 					},
 					yAxis: {
-						type: 'value'
+						type: 'value',
+						axisLabel: {
+							formatter: '{value} %'
+						}
 					},
-					series: data.series
-					//[
-					//	{
-					//	name: 'Email',
-					//	type: 'line',
-					////	stack: 'Total',
-					//	data: [120, 132, 101, 134, 90, 230, 210]
-					//	}
-					//]
+					series:
+					[
+						{
+							data: data.series[0].data,
+							type: 'line',
+							areaStyle: {}
+						}
+					]
 				},
 				true
 			)
@@ -225,7 +213,7 @@ export default {
 		},
 		// 新增—删除标签
 		handleClose(tag) {
-	
+
 			this.selectMaterielListtag.splice(this.selectMaterielListtag.indexOf(tag.componentName), 1);
 			var code = "";
 			var desc = "";
diff --git a/src/views/quality/qcTableXJ/index.vue b/src/views/quality/qcTableXJ/index.vue
index 7f8312c..b5175bc 100644
--- a/src/views/quality/qcTableXJ/index.vue
+++ b/src/views/quality/qcTableXJ/index.vue
@@ -58,7 +58,7 @@
 				</template>
 			</el-table-column>
 			<el-table-column prop="incomeBatchNo" label="批次" width="300" align="center"/>
-			<el-table-column prop="incomeTime" label="生产日期" width="100" align="center"/>
+			<el-table-column prop="incomeTimeStr" label="生产日期" width="100" align="center"/>
 			<el-table-column prop="materialName" label="产品名称"align="center"/>
 			<el-table-column prop="materialCode" label="产品编码" width="150" align="center"
 			:formatter="productCodeFormate"/>
@@ -229,6 +229,13 @@ export default {
 		/** 查询备料单列表 */
 		getList() {
 			this.loading = true;
+
+
+			if(this.queryParams.incomeTime != null){
+				this.queryParams.incomeTimeStr = moment(this.queryParams.incomeTime).format('YYYY-MM-DD');
+
+			}
+
 			getXJCheckTableList(this.queryParams).then(response => {
 				this.prepareList = response.rows;
 				this.total = response.total;
@@ -330,6 +337,7 @@ export default {
 			let sr = row;
 
 			this.queryParams.orderNo = sr.orderNo;
+			this.queryParams.shiftId = sr.shiftId;
 			getXJCheckTableDetail(this.queryParams).then(response => {
 				this.pOrderTableList = response;
 				this.openReport = true;
diff --git a/src/views/quality/qcTableXJAnalysis/index.vue b/src/views/quality/qcTableXJAnalysis/index.vue
index 737b4ff..f04994f 100644
--- a/src/views/quality/qcTableXJAnalysis/index.vue
+++ b/src/views/quality/qcTableXJAnalysis/index.vue
@@ -1,6 +1,7 @@
 <template>
     <div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px" style="margin-bottom: 0px;">
+      <!--
       <el-form-item label="订单编码" prop="orderNo">
         <el-input
           v-model="queryParams.orderNo"
@@ -16,7 +17,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="工单生产日期" prop="ymdms">
         <el-date-picker clearable
           v-model="queryParams.ymdms"
@@ -121,20 +122,7 @@ export default {
               tooltip: {
                 trigger: 'axis'
               },
-              legend: {
-                data: data.legendData
-              },
-              grid: {
-                left: '3%',
-                right: '4%',
-                bottom: '3%',
-                containLabel: true
-              },
-              toolbox: {
-                feature: {
-                  saveAsImage: {}
-                }
-              },
+
               xAxis: {
                 type: 'category',
                 boundaryGap: false,
@@ -146,7 +134,14 @@ export default {
                   formatter: '{value} %'
                 }
               },
-              series: seriesResult
+              series: 
+              [
+                {
+                  data: data.series[0].data,
+                  type: 'line',
+                  areaStyle: {}
+                }
+              ]
           },
           true
 			  )
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index efd35b5..fecca57 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -767,7 +767,7 @@ export default {
 		//检验项目弹窗(二次编辑)
 		handleCheckProjectM(row){
 			this.$refs.itemSelectProject.showFlag = true;
-			this.$refs.itemSelectProject.init(row,'material');
+			this.$refs.itemSelectProject.init(row,'product');
 		},
 
 		//查看检验项目弹窗
diff --git a/src/views/wms/product/index.vue b/src/views/wms/product/index.vue
index 7c6db3c..f93ae87 100644
--- a/src/views/wms/product/index.vue
+++ b/src/views/wms/product/index.vue
@@ -448,6 +448,7 @@
       append-to-body
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <!--
         <el-form-item label="标准效率" prop="iei">
           <el-input-number
             v-model="form.iei"
@@ -459,6 +460,12 @@
             v-model="form.manStandar"
             style="width: 320px"
           />
+        </el-form-item>-->
+        <el-form-item label="仓库检验周期" prop="warehouseCycle">
+          <el-input-number
+            v-model="form.warehouseCycle"
+            style="width: 320px"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -820,9 +827,7 @@ export default {
       this.reset();
       const productId = row.productId || this.ids;
       getProduct(productId).then((response) => {
-        this.form.id = response.data.id;
-        this.form.iei = response.data.iei;
-        this.form.manStandar = response.data.manStandar;
+        this.form = response.data;
         this.form.productCode = response.data.productCode.slice(7,18);
         console.log(this.form.productCode);
         this.openAttached = true;