Merge branch 'master' of http://www.koelndom.cn:13030/Huabao/FactorySystemWeb

src/views/Order/components/EditPackage.vue

@@ -271,6 +271,7 @@
 				postData.FOperateType = "1";
 				let result = await updatePackageData(postData) || -1;
 				if (result > 0) this.$emit('cancelClick', true);
+				if (result == -2) layer.msg("包规已存在", { icon : 2, time: 1000}) 
 				layer.close(idx);
 			},
 			async _getChildList() {

src/views/System/components/PowerRole.vue

@@ -46,7 +46,8 @@
 				</lay-collapse>
 			</lay-tab-item>
 		</lay-tab>
-		<view :class="'menuBtn mb' + tabIndex ">
+			
+		<view :class="'menuBtn mb'">
 			<lay-button type="normal" @click="submitMenuClick">保存</lay-button>
 			<lay-button @click="cancelClick">取消</lay-button>
 		</view>
@@ -71,6 +72,10 @@
 		position: absolute;
 		bottom: 38px;
 	}
+	.mb {
+		position: relative;
+		margin-top: 70px;
+	}
 
 	.mb4,
 	.mb5 {

src/views/Team/components/AddTerm.vue

@@ -136,6 +136,7 @@ import {
 import {
 	getFactoryList
 } from "/src/api/api/factory";
+import { layer } from '@layui/layer-vue';
 
 export default {
 	setup() {
@@ -305,6 +306,13 @@ export default {
 			postData.FWeightUnit = (postData.FWeightUnit || "").trim();
 			postData.FFormulaName = (postData.FFormulaName || "").trim();
 			postData.FCreateFactoryID=(postData.FCreateFactoryID==-1?"":postData.FCreateFactoryID);
+
+			// 没有试验号
+			if (!postData.FFormulaTestCode) {
+				layer.msg("所选配方无试验号", { icon : 2, time: 1000})
+				return false
+			}
+
 			for (let key in postData) {
 				if (postData[key] == "") return false;
 			}
@@ -313,12 +321,14 @@ export default {
 			// 	layer.msg('必须要输入包材代码')
 			// 	return false;
 			// }
+
 			postData.FState = isCreate ? 1 : 0;
 			postData = JSON.parse(JSON.stringify(postData));
 			if (postData.FTestCode != postData.FFormulaTestCode) {
 				this.sureTextCode(postData);
 				return false;
 			}
+
 			this._postTermData(postData);
 		},
 		//数据-确认

src/views/materia/all.vue

@@ -10,8 +10,8 @@
 							</lay-form-item>
 							<lay-form-item label="类型" prop="FTeamworkType">
 								<lay-select v-model="searchObj.FTeamworkType">
-									<lay-select-option v-for="(tIdv,tIdx) in typeList" :key="tIdx" :value="tIdv.FValue"
-										:label="tIdv.FName"></lay-select-option>
+									<lay-select-option v-for="(tIdv,tIdx) in typeList" :key="tIdx" :value="tIdv.id"
+										:label="tIdv.name"></lay-select-option>
 								</lay-select>
 							</lay-form-item>
 							<lay-form-item v-if="postData.FState!=99" label="事项状态" prop="FState">
@@ -165,7 +165,6 @@
 				current: 1
 			});
 			const dataList = ref([]);
-			const typeList = ref([]);
 			const searchObj = ref({});
 			const postData = ref({});
 			const MaterialModel= ref({});
@@ -174,12 +173,19 @@
 			const objInfoObj = ref({});
 			const editType = ref(1);
 			const stateList = ref([{
-				id: 1,
-				name: "进行中"
-			}, {
-				id: 2,
-				name: "已完成"
-			}]);
+					id: 1,
+					name: "进行中"
+				}, {
+					id: 2,
+					name: "已完成"
+				}]);
+			const typeList = ref([{
+					id: 1,
+					name: "新增"
+				}, {					
+					id: 2,
+					name: "修改"
+				}]);
 			const hasLoaded = ref(false);
 			const dataItem=ref([]);
 			return {
@@ -221,7 +227,6 @@
 				this.dataColumn[2].hide = true;
 				this.dataColumn[7].hide = false;
 			}
-			this._getTypeList();
 			this._getPageList(true);
 		},
 		methods: {
@@ -239,13 +244,6 @@
 					this.showEditBox[i] = false;
 				}
 			},
-			_getTypeList() {
-				this.typeList = [{
-					0: "全部",
-					1: "新增",
-					2: "修改"
-				}]
-			},
 			//分页列表
 			async _getPageList(isFirst, showOk) {
 				this.pageInfo.total = 0;

src/views/materia/components/AddMateria.vue

@@ -26,10 +26,10 @@
 				{{ seletList[0].find(s => s.FValue == dataInfo.FWeightUnit).FName }}
 			</p>
 		</lay-form-item>
-		<lay-form-item label="是否原料" prop="FIsRaw" label-width="120">
+		<lay-form-item label="是否获取MDM编码" prop="FIsRaw" label-width="120">
 			<lay-checkbox skin="primary" v-model="dataInfo.FIsRaw"></lay-checkbox>
 		</lay-form-item>
-		<lay-form-item label="试验号" prop="FTestCode"  required label-width="120">
+		<lay-form-item label="试验号" prop="FTestCode" label-width="120">
 			<lay-input v-model="dataInfo.FTestCode"></lay-input>
 		</lay-form-item>
 	</lay-form>
@@ -283,7 +283,7 @@ export default {
 			postData.FState = isCreate ? 1 : 0;
 
 			for (let key in postData) {
-				if (postData[key] == "") return false;
+				if (postData[key] == "" && key != "FTestCode") return false;
 			}
 			
 			postData = JSON.parse(JSON.stringify(postData));

src/views/materia/route.vue

@@ -6,19 +6,19 @@
 				<lay-card>
 					<lay-form :model="searchObj" class="search-box">
 						<lay-row class="search-items">
-							<lay-form-item label="物料号" prop="FSaleCode">
-								<lay-input v-model="searchObj.FSaleCode"></lay-input>
+							<lay-form-item label="物料号" prop="FMaterialCode">
+								<lay-input v-model="searchObj.FMaterialCode"></lay-input>
 							</lay-form-item>
 							<lay-form-item label="类型" prop="FType">
 								<lay-select v-model="searchObj.FType">
-									<lay-select-option v-for="(tIdv,tIdx) in typeList" :key="tIdx" :value="tIdv.FValue"
-													   :label="tIdv.FName"></lay-select-option>
+									<lay-select-option v-for="(tIdv,tIdx) in typeList" :key="tIdx" :value="tIdv.id"
+										:label="tIdv.name"></lay-select-option>
 								</lay-select>
 							</lay-form-item>
 							<lay-form-item v-if="postData.FState!=99" label="事项状态" prop="FState">
 								<lay-select v-model="searchObj.FState">
 									<lay-select-option v-for="(tv,tx) in stateList" :key="tx" :value="tv.id"
-													   :label="tv.name"></lay-select-option>
+										:label="tv.name"></lay-select-option>
 								</lay-select>
 							</lay-form-item>
 							<lay-form-item label="发起日期" prop="FDateRange">
@@ -37,11 +37,10 @@
 						<template v-slot:toolbar>
 							<lay-button size="sm" @click="_getPageList(false,true)">刷新</lay-button>
 							<lay-button size="sm" type="normal" style="float:right" @click="showEditMaterial(1)">导出</lay-button>
-
 						</template>
-						<template v-slot:FStateName="{ data }">
-							<span v-if="data.FStateName=='已完成'" style="color:#5FB878">{{ data.FStateName }}</span>
-							<span v-else style="color:#1E9FFF">{{ data.FStateName }}</span>
+						<template v-slot:FState="{ data }">
+							<span v-if="data.FState==1" style="color:#5FB878">进行中</span>
+							<span v-else style="color:#1E9FFF">已完成</span>
 						</template>
 						<template v-if="dataInfoObj == undefined|| !dataInfoObj.FID" v-slot:operator="{ data }">
 							<lay-button size="xs" type="primary" @click="_clickSetInfo(data)">操作</lay-button>
@@ -95,14 +94,14 @@
 				{
 					title: "物料号",
 					key: "FMaterialCode",
-					width: "160px",
+					width: "120px",
 					align: 'center',
 					hide: false
 				},
 				{
 					title: "试验号",
 					key: "FTestCode",
-					width: "160px",
+					width: "120px",
 					align: 'center',
 					hide: false
 				},
@@ -115,7 +114,7 @@
 				{
 					title: "产品分类",
 					key: "FMaterialTypeName",
-					width: "200px",
+					width: "160px",
 					align: 'center'
 				},
 				{
@@ -137,6 +136,13 @@
 					align: 'center',
 					customSlot: '',
 				},
+				{
+					title: "状态",
+					key: "FState",
+					width: "100px",
+					align: 'center',
+					customSlot: 'FState',
+				},
 				{
 					title: "操作",
 					key: "operator",
@@ -155,7 +161,16 @@
 				current: 1
 			});
 			const dataList = ref([]);
-			const typeList = ref([]);
+			const typeList = ref([{
+				id: 0,
+				name: "物料分类选择"
+			}, {
+				id: 1,
+				name: "物料视图编辑"
+			}, {
+				id: 2,
+				name: "物料视图确认"
+			}]);
 			const searchObj = ref({});
 			const postData = ref({});
 			const MaterialModel= ref({});
@@ -212,7 +227,6 @@
 				this.dataColumn[7].hide = false;
 			}
 
-			this._getTypeList();
 			this._getPageList(true);
 		},
 		methods: {
@@ -230,9 +244,6 @@
 					this.showEditBox[i] = false;
 				}
 			},
-			async _getTypeList() {
-				this.typeList = await getBasicList(33) || [];
-			},
 			//分页列表
 			async _getPageList(isFirst, showOk) {
 				//this.dataList = [];
@@ -240,6 +251,7 @@
 				if (isFirst) {
 					this.pageInfo.current = 1;
 					this.pageInfo.total = 0;
+					this.postData.FType = -1;
 				}
 				if (this.dataInfoObj && this.dataInfoObj.FID) {
 					this.postData.FTeamID = this.dataInfoObj.FID;
@@ -248,8 +260,10 @@
 				if (this.pageTypeObj && this.pageTypeObj == 2) {
 					this.postData.FState = 99;
 				}
+				if (!("FType" in this.postData)) this.postData.FType = -1;
 				this.postData.FPageIndex = this.pageInfo.current;
 				this.postData.FPageSize = this.pageInfo.limit;
+				console.log('this.postData', this.postData);
 				let result = await getPageList(this.postData, "MaterialTask");
 
 				result.Data.List = result.Data.List || [];
@@ -314,12 +328,12 @@
 					let val = this.searchObj[key];
 					if (val != null && val !== "") this.postData[key] = val;
 				}
-				this._getPageList(true);
+				this._getPageList(false);
 			},
 			//检索-重置
 			_clickReset() {
 				this.searchObj = {};
-				this._clickSearch();
+				this._getPageList(true);
 			}
 		}
 	}