commit by yzf

src/views/Team/components/ShowView.vue

@@ -54,7 +54,9 @@
 			this.initPage();
 		},
 		methods: {
+			
 			initPage() {
+				debugger
 				let dataColumn = [{
 					type: "number",
 					title: "序号",

src/views/half/components/EditMateria.vue

@@ -40,7 +40,7 @@
 			<lay-button @click="cancelClick">取消</lay-button>
 		</lay-form-item>
 	</div>
-	<lay-layer :area="['70%', '80%']" v-model="showEditBox" title="选择包材">
+	<lay-layer :area="['70%', '80%']" v-model="showEditBox" title="选择配方">
 		<MaterialSelect @_getSeachData="_getSeachData" :dataType1="dataType" @cancelClick="showEditBox = false">
 		</MaterialSelect>
 	</lay-layer>
@@ -154,7 +154,11 @@ export default {
 			title: "物料描述",
 			key: "FDesc",
 			width: "110px",
-			width: "260px"
+		},
+		{
+			title: "模式",
+			key: "FFactoryID",
+			width: "110px",
 		},
 		{
 			title: "产品分类",
@@ -295,24 +299,22 @@ export default {
 			this.showEditBox = true;
 		},
 		_getSeachData(data) {
-			debugger
 			if (this.dataType == 1) {
 				this.formula1 = data.FTestCode;
-				this.formula1Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc;
+				this.formula1Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FName;
 				this.fVersion1Code=data.FVersionCode;
-				this.FDesc=data.FDesc;
+				this.FDesc=data.FName;
 				this._getPageList(true);
 			} else {
 				this.formula2 = data.FTestCode;
-				this.formula2Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FDesc;
+				this.formula2Name =  data.FTestCode+"+"+data.FVersionCode+"+"+data.FName;
 				this.fVersion2Code=data.FVersionCode;
-				this.FNewDesc=data.FDesc;
+				this.FNewDesc=data.FName;
 			}
 			this.showEditBox = false;
 		},
 		//配方接口
 		async _getPageList(isFirst) {
-			debugger
 			if (isFirst) {
 				this.pageInfo.current = 1;
 				this.pageInfo.total = 0;
@@ -329,8 +331,16 @@ export default {
 			}
 			if (this.formula1Name != "") {
 				let result = await getPageList(postData, "Material");
+				debugger
+				let factoryList=[];
+				for(let i=0;i<this.factoryLists.length;i++){
+					factoryList.push(this.factoryLists[i]);
+				}
 				result.Data.List = result.Data.List || [];
 				result.Data.List.forEach((item) => {
+					if(factoryList){
+						item.FFactoryID=factoryList.find(s=>s.FID==item.FFactoryID).FName;
+					}
 					let type = this.typeList.find(s => s.FValue == item.FType);
 					item.FTypeName = type == null ? item.FType : type.FName;
 					if (this.dataInfo.FFormulaID == item.FID) this.selectedKey = item.FID
@@ -366,7 +376,6 @@ export default {
 			}
 			
 			let ids = layer.load(0)
-			debugger
 
 			let result = await InsertDataModel(postData);
 				if (result.Code == 200) {

src/views/half/components/MaterialSelect.vue

@@ -57,6 +57,11 @@
 					key: "FName",
 					align: 'center'
 				},
+				{
+					title: "版本号",
+					key: "FVersionCode",
+					align: 'center'
+				},
 				{
 					title: "操作",
 					key: "operator",
@@ -110,10 +115,10 @@
 				this.postData.FPageIndex = this.pageInfo.current;
 				this.postData.FPageSize = this.pageInfo.limit;
 				let result = await getPageList(this.postData, "Formula");
+				debugger
 				result.Data.List = result.Data.List || [];
 				this.pageInfo.total = result.Data.Total || 0;
 				this.dataList = result.Data.List;
-				debugger
 			},
 			//日期处理
 			dateFormat(dataStr) {
@@ -121,7 +126,6 @@
 			},
 			_choseData(data) {
 				let $this = this;
-				debugger
 				layer.confirm("您确定要选择此子项吗？", {
 					title: "提示",
 					btn: [{

src/views/half/components/ShowData1.vue

@@ -4,22 +4,32 @@
 			<lay-container class="dataInfo">
 
 				<lay-row space="10">
-					<lay-col md="6"><div class="grid-demo" style="text-align: right;">原配方：</div></lay-col>
-					<lay-col md="18"><div class="grid-demo" style="text-align: left;">{{dataInfoObj.FTestCode}}+{{dataInfoObj.FVersionCode}}+{{dataInfoObj.FDesc}}</div></lay-col>
+					<lay-col md="6">
+						<div class="grid-demo" style="text-align: right;">原配方：</div>
+					</lay-col>
+					<lay-col md="18">
+						<div class="grid-demo" style="text-align: left;">
+							{{ dataInfoObj.FTestCode }}+{{ dataInfoObj.FVersionCode }}+{{ dataInfoObj.FDesc }}</div>
+					</lay-col>
 				</lay-row>
 				<lay-row space="10">
-					<lay-col md="6"><div class="grid-demo" style="text-align: right;">变更后的配方：</div></lay-col>
-					<lay-col md="18"><div class="grid-demo" style="text-align: left;">{{dataInfoObj.FNewTestCode}}+{{dataInfoObj.FNewVersionCode}}+{{dataInfoObj.FNewDesc}}</div></lay-col>
+					<lay-col md="6">
+						<div class="grid-demo" style="text-align: right;">变更后的配方：</div>
+					</lay-col>
+					<lay-col md="18">
+						<div class="grid-demo" style="text-align: left;">
+							{{ dataInfoObj.FNewTestCode }}+{{ dataInfoObj.FNewVersionCode }}+{{ dataInfoObj.FNewDesc }}</div>
+					</lay-col>
 				</lay-row>
 			</lay-container>
-			<lay-quote v-if="dataList.length>0">视图信息</lay-quote>
-			<lay-container class="tableInfo" v-if="dataList.length>0">
+			<lay-quote v-if="dataList.length > 0">视图信息</lay-quote>
+			<lay-container class="tableInfo" v-if="dataList.length > 0">
 				<lay-table :columns="dataColumn" :dataSource="dataList">
 					<template v-slot:operator="{ data }">
-						<lay-button v-if="data.seeCode!=''" size="xs" type="primary" @click="_getTeamworkView(data,1)">
+						<lay-button v-if="data.seeCode != ''" size="xs" type="primary" @click="_getTeamworkView(data, 1)">
 							查看
 						</lay-button>
-						<lay-button v-if="data.outCode!=''" size="xs" type="primary" @click="_getTeamworkView(data,2)">
+						<lay-button v-if="data.outCode != ''" size="xs" type="primary" @click="_getTeamworkView(data, 2)">
 							导出
 						</lay-button>
 					</template>
@@ -27,53 +37,50 @@
 			</lay-container>
 		</lay-scroll>
 		<lay-layer area="90%" v-model="showEditBox" title="视图查看">
-			<ShowMaterial :viewList="viewList" :viewHeight="viewHeight" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></ShowMaterial>
-		</lay-layer>
-		<lay-layer area="90%" v-model="showEditBox1" title="配方视图">
-			<FormulaView :viewList="viewList" :viewHeight="viewHeight" :dataInfoObj="objInfoObj" @cancelClick="cancelClick"></FormulaView>
+			<ShowView :viewList="viewList" :viewHeight="viewHeight" @cancelClick="cancelClick"></ShowView>
 		</lay-layer>
 	</div>
 </template>
 
 <style scoped>
-	.box-data {
+.box-data {
 	margin: 10px auto;
 	display: block;
-	}
+}
 
-	.dataInfo {
+.dataInfo {
 	max-width: 960px;
 	margin: 14px auto 20px;
 	overflow: hidden;
 	clear: both;
 	float: none;
-	}
+}
 
-	.pro-item.state1 {
+.pro-item.state1 {
 	background-color: rgb(50, 189, 182, 0.9);
 	background-image: url('../../../assets/state1.png');
 	box-shadow: 4px 4px 4px rgb(50, 189, 182, 0.4);
-	}
+}
 
-	.pro-item.state2 {
+.pro-item.state2 {
 	background-color: rgb(22, 138, 221, 0.9);
 	background-image: url('../../../assets/state2.png');
 	box-shadow: 4px 4px 4px rgb(22, 138, 221, 0.4);
-	}
+}
 
-	.pro-item.none {
+.pro-item.none {
 	float: none !important;
 	display: block !important;
 	margin-left: auto;
 	margin-right: auto;
 	overflow: hidden;
-	}
+}
 
-	.pro-item.none .left {
+.pro-item.none .left {
 	margin-top: 11px;
-	}
+}
 
-	.pro-item {
+.pro-item {
 	background: rgb(187, 187, 187, 0.9) url('../../../assets/state0.png') no-repeat left top;
 	-webkit-border-radius: 6px;
 	-ms-border-radius: 6px;
@@ -84,27 +91,27 @@
 	margin: 10px 1%;
 	padding: 16px 5px;
 	box-shadow: 4px 4px 4px rgb(187, 187, 187, 0.4);
-	}
+}
 
-	.pro-item .left {
+.pro-item .left {
 	width: 34%;
 	display: block;
 	text-align: center;
 	float: left;
 	margin-top: 13px;
 	margin-bottom: 5px;
-	}
+}
 
-	.pro-item .left.margin {
+.pro-item .left.margin {
 	margin-top: 6px;
 	margin-bottom: 0;
-	}
+}
 
-	.pro-item .left.margin .group {
+.pro-item .left.margin .group {
 	margin: 6px auto 2px;
-	}
+}
 
-	.pro-item .left .num {
+.pro-item .left .num {
 	-webkit-border-radius: 32px;
 	-ms-border-radius: 32px;
 	-o-border-radius: 32px;
@@ -116,9 +123,9 @@
 	width: 32px;
 	border: 1px solid #222;
 	margin: 0 auto;
-	}
+}
 
-	.pro-item .left .group {
+.pro-item .left .group {
 	font-weight: 500;
 	line-height: 22px;
 	margin: 10px auto 8px;
@@ -126,55 +133,54 @@
 	max-width: 100px;
 	display: block;
 	overflow: hidden;
-	}
+}
 
-	.pro-item .right {
+.pro-item .right {
 	width: 63%;
 	display: inline-block;
 	line-height: 22px;
-	}
+}
 
-	.pro-item .right p {
+.pro-item .right p {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis
-	}
+}
 
-	.pro-next {
+.pro-next {
 	display: block;
 	background: url('../../../assets/state-next.jpg') no-repeat center;
 	height: 30px;
 	margin: 10px auto;
-	}
+}
 
-	.tableInfo {
+.tableInfo {
 	max-width: 96%;
 	margin: 20px auto;
 	overflow: hidden;
 	clear: both;
 	float: none;
-	}
+}
 </style>
 <script>
-	import {
+import {
 	ref,
 	watch
-	} from 'vue';
-	import {
+} from 'vue';
+import {
 	getTeamProcessList,
 	getTeamworkView
-	} from "/src/api/api/teamwork";
-	import {
+} from "/src/api/api/halfmaterialteamwork";
+import {
 	getBasicRoleList
-	} from "/src/api/api/user";
+} from "/src/api/api/user";
 
-	import ShowMaterial from './ShowMaterial.vue';
-	import FormulaView from './FormulaView.vue';
+import ShowView from './ShowView.vue';
+import FormulaView from './FormulaView.vue';
 
-	export default {
+export default {
 	components: {
-			ShowMaterial,
-			FormulaView
+		ShowView
 	},
 	setup() {
 		const dataList = ref([]);
@@ -197,7 +203,7 @@
 		const showEditBox1 = ref(false);
 		const viewList = ref([]);
 		const viewHeight = ref(500);
-			const objInfoObj=ref([]);
+		const objInfoObj = ref([]);
 		return {
 			dataList,
 			dataColumn,
@@ -213,7 +219,7 @@
 	props: {
 		dataInfoObj: {
 			type: Object,
-				default: () => {},
+			default: () => { },
 		}
 	},
 	mounted() {
@@ -223,26 +229,40 @@
 
 		//获取视图
 		async _getViewList() {
-				debugger
-				this.dataList = [{"name":"物料视图","code":"1","outCode":"6"},{"name":"配方视图","code":"2","outCode":"10"}];
+			this.dataList = [{ "name": "物料视图", "code": "1", "outCode": "6","seeCode":"1" }, { "name": "配方视图", "code": "2", "outCode": "7","seeCode":"2" }];
 		},
 		async _getTeamworkView(data, type) {
-				debugger
-				
+			let viewType = parseInt(type == 1 ? data.seeCode : data.outCode);
+				if (type == 2) viewType = viewType - this.viewTypeCount;
+				let postData = {
+					FTeamID: this.dataInfoObj.FID,
+					FViewType: viewType,
+					FType: type,
+					HalfId : this.dataInfoObj.FMaterialHalfIDs
+				};
+				if (this.dataInfoObj.FProgress == "100" || this.dataInfoObj.FProgress == "100%") {
+					postData.FFinish = 1;
+				}
 				let idx = layer.load(2);
+				let result = await getTeamworkView(postData);
 				layer.close(idx);
 				if (type == 1) {
-
-					if(data.code==1)
-					{
-						this.objInfoObj=this.dataInfoObj;
+					let list = [];
+					let count = 0;
+					for (let key in result) {
+						list.push(result[key]);
+						count += result[key].length;
+					};
+					if (count == 0) {
+						layer.msg("请稍等，视图信息还在编辑中", {
+							time: 2000,
+							icon: 3
+						});
+					} else {
+						this.viewList = list;
+						this.viewHeight = Math.ceil(500);
 						this.showEditBox = true;
 					}
-					else if(data.code==2){
-						this.objInfoObj=this.dataInfoObj;
-						this.showEditBox1 = true;
-					}
-					
 				} else {
 					window.open(result);
 				}
@@ -256,5 +276,5 @@
 			this.$emit('cancelClick', isFirst ? isFirst : false);
 		}
 	}
-	}
+}
 </script>

src/views/half/half.vue

@@ -1,5 +1,6 @@
 <template>
-	<lay-container fluid="true" :style="'padding:10px;height:' + (dataInfoObj != undefined ? (dataInfoObj.FHeight + 'px') : 'auto')">
+	<lay-container fluid="true"
+		:style="'padding:10px;height:' + (dataInfoObj != undefined ? (dataInfoObj.FHeight + 'px') : 'auto')">
 		<lay-row space="10">
 			<lay-col span="24">
 				<lay-card>
@@ -42,7 +43,7 @@
 							<span v-else style="color:#1E9FFF">{{ data.FStateName }}</span>
 						</template>
 						<template v-if="dataInfoObj == undefined || !dataInfoObj.FID" v-slot:operator="{ data }">
-							<lay-button size="xs" type="primary" @click="showEditMaterial(3,data)">详情</lay-button>
+							<lay-button size="xs" type="primary" @click="showEditMaterial(3, data)">详情</lay-button>
 						</template>
 					</lay-table>
 				</lay-card>
@@ -70,10 +71,13 @@ import {
 	getBasicList,
 	getPageList
 } from "/src/api/api/common";
+import{
+	getFactoryList
+}from "/src/api/api/factory";
 import ShowData1 from '../half/components/ShowData1.vue';
 import EditMateria from '../half/components/EditMateria.vue';
 import EditView from '../half/components/EditView.vue';
-import {GetMaterialTeamworkPageList} from"/src/api/api/halfmaterialteamwork"
+import { GetMaterialTeamworkPageList } from "/src/api/api/halfmaterialteamwork"
 import '@layui/layui-vue/es/checkbox/index.css';
 import '@layui/layui-vue/es/radio/index.css';
 
@@ -119,8 +123,8 @@ export default {
 				align: 'center'
 			},
 			{
-				title: "产品分类",
-				key: "FType",
+				title: "模式",
+				key: "FCreateFactoryID",
 				width: "150px",
 				align: 'center'
 			},
@@ -156,6 +160,7 @@ export default {
 		const selectedKeys = ref(["1"]);
 		const checkbox = ref(false);
 		const defaultToolbar = ref(true);
+		const factoryLists = ref([]);
 		const pageInfo = ref({
 			total: 0,
 			limit: 10,
@@ -196,7 +201,8 @@ export default {
 			stateList,
 			hasLoaded,
 			MaterialModel,
-			dataItem
+			dataItem,
+			factoryLists
 		};
 	},
 	props: {
@@ -219,9 +225,14 @@ export default {
 			this.dataColumn[7].hide = false;
 		}
 		this._getTypeList();
-		this._getPageList(true);
+		this._getFactoryList();
+		
 	},
 	methods: {
+		async _getFactoryList(){
+            this.factoryLists=await getFactoryList()||[];
+			this._getPageList(true);
+		},
 		changePage(obj) {
 			this.pageInfo.current = obj.current;
 			this.pageInfo.limit = obj.limit;
@@ -241,6 +252,10 @@ export default {
 		},
 		//分页列表
 		async _getPageList(isFirst, showOk) {
+			let factoryList=[];
+			for(let i=0;i<this.factoryLists.length;i++){
+				factoryList.push(this.factoryLists[i]);
+			}
 
 			this.pageInfo.total = 0;
 			if (isFirst) {
@@ -252,21 +267,22 @@ export default {
 			if (this.dataInfoObj != undefined) {
 				this.postData.FDataType = this.dataInfoObj;
 			}
-
-				let $this=this;
+			let $this = this;
 			let result = await GetMaterialTeamworkPageList(this.postData);
-			this.dataList = result.Data.List.map(function(item){
+			this.dataList = result.Data.List.map(function (item) {
 				item.FAddDate = item.FAddDate == null ? "" : $this.dateFormat(item.FAddDate);
-				if(item.FState==2)
-				{
-					item["FStateName"]="已完成";
+
+				if(factoryList){
+					item.FCreateFactoryID=factoryList.find(s=>s.FID==item.FCreateFactoryID).FName;
+				}
+				if (item.FState == 2) {
+					item["FStateName"] = "已完成";
 				}
-				else if(item.FState==1){
-					item["FStateName"]="进行中";
+				else if (item.FState == 1) {
+					item["FStateName"] = "进行中";
 				}
 				return item;
 			});
-			debugger
 
 			this.hasLoaded = true;
 		},
@@ -283,13 +299,11 @@ export default {
 			this.editType = 1;
 
 		},
-		showEditMaterial(i,data) {
-			debugger
-			if(data)
-			{
-				data["FTeamID"]=data.FID;
+		showEditMaterial(i, data) {
+			if (data) {
+				data["FTeamID"] = data.FID;
 			}
-			this.objInfoObj=data;
+			this.objInfoObj = data;
 
 			this.showEditBox[i] = true;
 		},