From e3b3412f2dd8d7e7fda430010c7454526e79dce3 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sat, 15 Apr 2023 23:41:20 +0800
Subject: [PATCH] commit by yzf

---
 src/api/api/formula.ts                        | 10 +++++++
 .../Need/components/EditFSuccedaneum.vue      |  1 +
 src/views/Need/components/EditMaterial.vue    | 10 ++++++-
 src/views/half/components/EditMateria.vue     | 30 ++++++++++++++-----
 src/views/log/log.vue                         |  2 ++
 src/views/materia/components/AddMateria.vue   | 13 ++++----
 src/views/materia/components/EditMateria.vue  |  8 ++---
 src/views/materia/components/EditView.vue     |  5 ----
 8 files changed, 54 insertions(+), 25 deletions(-)

diff --git a/src/api/api/formula.ts b/src/api/api/formula.ts
index 6d60c36..7b7d27c 100644
--- a/src/api/api/formula.ts
+++ b/src/api/api/formula.ts
@@ -8,3 +8,13 @@ export async function dockSapFormula(param) {
 	});
 	return result;
 }
+
+
+//获取配方集合
+export async function getFormulaList() {
+	var dataList = [];
+	await http.post('/api/Formula/GetFormulaList').then((data) => {
+		dataList = data.Data;
+	});
+	return dataList;
+}
\ No newline at end of file
diff --git a/src/views/Need/components/EditFSuccedaneum.vue b/src/views/Need/components/EditFSuccedaneum.vue
index 1bfb385..cc4a7a4 100644
--- a/src/views/Need/components/EditFSuccedaneum.vue
+++ b/src/views/Need/components/EditFSuccedaneum.vue
@@ -1,6 +1,7 @@
 <template>
 	<lay-container style="height:700px;overflow: auto;" fluid="true" class="content-box">
 		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
+		
 		<lay-table id="dataTable" v-if="dataColumn.length > 0" height="320px" :columns="dataColumn" :data-source="dataList"
 			:cellStyle="cellStyle" :cellClassName="cellClassName">
 			<template v-slot:toolbar v-if="dataInfoObj.FCanEdit != 2">
diff --git a/src/views/Need/components/EditMaterial.vue b/src/views/Need/components/EditMaterial.vue
index 7a81ef3..5906a6c 100644
--- a/src/views/Need/components/EditMaterial.vue
+++ b/src/views/Need/components/EditMaterial.vue
@@ -1,6 +1,10 @@
 <template>
-	<lay-container class="content-box" :style="'padding-top:' + (editType != 1 ? 0 : 35) + 'px'">
+	<lay-container class="content-box" :style="'padding-top:15px'">
+		<lay-form-item class="search-btn">
+			<lay-button size="sm" type="primary" @click="_addMaterial">替代料为新物料</lay-button>
+		</lay-form-item>
 		<view class="edit-box">
+
 			<lay-form :model="searchObj" class="search-box edit-info">
 				<lay-row class="color666">
 					<lay-form-item label="物料号" prop="FCode">
@@ -253,6 +257,10 @@ export default {
 			this.pageInfo.total = result.Data.Total || 0;
 			this.dataList = result.Data.List;
 		},
+		_addMaterial(){
+			debugger
+			this.$router.push("/materia/all");
+		},
 		//提交
 		async submitClick() {
 			let updateInfo = {
diff --git a/src/views/half/components/EditMateria.vue b/src/views/half/components/EditMateria.vue
index 41a2a64..92bc28a 100644
--- a/src/views/half/components/EditMateria.vue
+++ b/src/views/half/components/EditMateria.vue
@@ -1,19 +1,25 @@
 <template>
 	<lay-form :model="dataInfo" class="dataInfo">
-		<lay-form-item label="原配方" prop="FCreateFactoryID" required label-width="120" style="margin-bottom:30px;">
-			<lay-select v-model="dataInfo.FCreateFactoryID" placeholder="请选择">
-				<lay-select-option v-for="(fIdv, fIdx) in factoryLists" key="fIdx" :value="fIdv.FID" :label="fIdv.FName"></lay-select-option>
+		<lay-form-item label="原配方" prop="formula1" required label-width="120" style="margin-bottom:30px;">
+			<lay-select v-model="formula1" placeholder="请选择">
+				<lay-select-option v-for="(fIdv, fIdx) in formulaList" key="fIdx" :value="fIdv.FID" :label="fIdv.FName"></lay-select-option>
 			</lay-select>
 			<p class="note">注：配方号+版本号+描述</p>
 		</lay-form-item>
 
-		<lay-form-item label="变更后的配方" prop="FFormulaName" required label-width="120" style="margin-bottom:30px;">
+		<lay-form-item label="变更后的配方" prop="formula2" required label-width="120" style="margin-bottom:30px;">
+			<lay-select v-model="formula2" placeholder="请选择">
+				<lay-select-option v-for="(fIdv, fIdx) in formulaList" key="fIdx" :value="fIdv.FID" :label="fIdv.FName"></lay-select-option>
+			</lay-select>
+			<p class="note">注：配方号+版本号+描述</p>
+		</lay-form-item>
+		<lay-form-item label="模式" prop="FFormulaName" required label-width="120" style="margin-bottom:30px;">
 			<lay-select v-model="dataInfo.FCreateFactoryID" placeholder="请选择">
 				<lay-select-option v-for="(fIdv, fIdx) in factoryLists" key="fIdx" :value="fIdv.FID" :label="fIdv.FName"></lay-select-option>
 			</lay-select>
-			<p class="note">注：配方号+版本号+描述</p>
 		</lay-form-item>
 
+
 		<lay-form-item>
 			<p class="note3">配方变更影响的旧物料</p>
 			
@@ -107,7 +113,9 @@ import {
 import {
 	getFactoryList
 } from "/src/api/api/factory";
-
+import{
+	getFormulaList
+} from '/src/api/api/formula'
 export default {
 	setup() {
 		const dataInfo = ref({
@@ -168,6 +176,8 @@ export default {
 		const saleList = ref([]);
 		const factoryLists = ref([]);
 		const factoryValue=ref(null);
+		const formula1=ref(null);
+		const formula2=ref(null);
 		return {
 			dataInfo,
 			formulaList,
@@ -181,7 +191,9 @@ export default {
 			showButton,
 			saleList,
 			factoryLists,
-			factoryValue
+			factoryValue,
+			formula1,
+			formula2
 		}
 	},
 	props: {
@@ -198,6 +210,7 @@ export default {
 		}
 		this._getSelectList();
 		this._getFactoryList();
+		this._getFormulaList();
 	},
 	methods: {
 		cancelClick(isFirst) {
@@ -213,6 +226,9 @@ export default {
 			}, "Teamwork");
 			this.dataInfo = result || this.dataInfo;
 		},
+		async _getFormulaList(){
+			this.formulaList=await getFormulaList();
+		},
 		async _getSelectList() {
 			let result = await getDataCode({
 				FType: '1,2'
diff --git a/src/views/log/log.vue b/src/views/log/log.vue
index 1a45852..a740546 100644
--- a/src/views/log/log.vue
+++ b/src/views/log/log.vue
@@ -221,6 +221,8 @@
 			//分页列表
 			async _getPageList(isFirst, showOk) {
 
+				let result= await getPageList(this.pageInfo, "OperateLog");
+				debugger
 				this.dataList = [
 					{"F1":"1","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"新增协同","F5":"2022-10-24 11:00","F6":"新增","F7":"Kai"},
 					{"F1":"2","F2":"协同路线","F3":"KTFKP22100901-K501@测试","F4":"查看了物料视图","F5":"2022-10-24 11:00","F6":"查看","F7":"Kai"}
diff --git a/src/views/materia/components/AddMateria.vue b/src/views/materia/components/AddMateria.vue
index de3f6eb..0bd5852 100644
--- a/src/views/materia/components/AddMateria.vue
+++ b/src/views/materia/components/AddMateria.vue
@@ -26,13 +26,10 @@
 				{{ seletList[0].find(s => s.FValue == dataInfo.FWeightUnit).FName }}
 			</p>
 		</lay-form-item>
-		<lay-form-item label="物料类型" prop="FMaterialType" required label-width="120" style="margin-bottom:30px;">
-			<lay-select v-model="dataInfo.FMaterialGroup" v-if="seletList[1].length > 0">
-				<lay-select-option v-for="(rV, rI) in seletList[1]" key="rI" :value="rV.FValue + ''" :label="rV.FName">
-				</lay-select-option>
-			</lay-select>
+		<lay-form-item label="是否原料" label-width="120">
+			<lay-checkbox name="like" skin="primary" v-model="checked" value="1"></lay-checkbox>
 		</lay-form-item>
-		<lay-form-item label="试验号" prop="FTestCode" required label-width="120">
+		<lay-form-item label="试验号"  required label-width="120">
 			<lay-input v-model="dataInfo.FTestCode"></lay-input>
 		</lay-form-item>
 	</lay-form>
@@ -114,6 +111,7 @@ import {
 
 export default {
 	setup() {
+		const checked = ref(false);
 		const dataInfo = ref({
 			FMaterialType: "ZMAT",
 			FWeightUnit: "KG"
@@ -183,7 +181,8 @@ export default {
 			showButton,
 			saleList,
 			factoryLists,
-			factoryValue
+			factoryValue,
+			checked
 		}
 	},
 	props: {
diff --git a/src/views/materia/components/EditMateria.vue b/src/views/materia/components/EditMateria.vue
index e42a338..7e53e4f 100644
--- a/src/views/materia/components/EditMateria.vue
+++ b/src/views/materia/components/EditMateria.vue
@@ -6,11 +6,9 @@
 			</lay-select>
 			<p class="note">注：模式必选，通过模式确认视图类型</p>
 		</lay-form-item>
-
-		<lay-form-item label="请选择物料名称" prop="FFormulaName" required label-width="120" style="margin-bottom:30px;">
-			<lay-select v-model="dataInfo.FCreateFactoryID" placeholder="请选择">
-				<lay-select-option v-for="(fIdv, fIdx) in factoryLists" key="fIdx" :value="fIdv.FID" :label="fIdv.FName"></lay-select-option>
-			</lay-select>
+		<lay-form-item label="请选择物料名称" prop="FSearchName" label-width="120" class="FSearchName">
+			<lay-input v-model="dataInfo.FSearchName"></lay-input>
+			<lay-button type="primary" @click="_searchPageList" class="search-btn2">检索</lay-button>
 			<p class="note">注：检索该模式下的所有物料</p>
 		</lay-form-item>
 		<lay-form-item v-if="dataList.length > 0">
diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index 6cda0a9..c7f8dec 100644
--- a/src/views/materia/components/EditView.vue
+++ b/src/views/materia/components/EditView.vue
@@ -1,6 +1,5 @@
 <template>
 	<lay-container fluid="true" class="content-box">
-		<FormulaView :teamId="dataInfoObj.FTeamID" :halfId="dataInfoObj.FMaterialHalfIDs"></FormulaView>
 
 		<lay-layer area="90%" v-model="showFreezingColumnSettingBox" title="固定列设置" :end="closeFreezingSetting">
 			<FreezingColumnSetting v-if="showFreezingColumnSettingBox" :columns="originalColumns"
@@ -21,8 +20,6 @@
 					@click="_clickFreezingColumnSetting()">固定项
 				</lay-button>
 				<lay-button size="sm" style="float:right" type="primary">导出</lay-button>
-				<lay-button size="sm" style="float:right" type="primary">保存</lay-button>
-				<lay-button size="sm" style="float:right" type="primary">确认</lay-button>
 				<lay-button size="sm" style="float:right">刷新</lay-button>
 			</template>
 			<template v-for="item in editColumn" v-slot:[item.key]="{ data }">
@@ -114,13 +111,11 @@ import {
 	changeInfoData
 } from "/src/api/api/materialType";
 import OperateLog from "./OperateLog.vue";
-import FormulaView from "./FormulaView.vue";
 import FreezingColumnSetting from './FreezingColumnSetting.vue';
 
 export default {
 	components: {
 		OperateLog,
-		FormulaView,
 		FreezingColumnSetting
 	},
 	setup() {