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

src/views/half/components/EditViewOFF.vue

@@ -37,6 +37,9 @@
 						:value="tIdv.FValue" :label="tIdv.FName"></lay-select-option>
 				</lay-select>
 				<lay-input v-else-if="!item.dataType &&data['Power'].indexOf(item.key+',')>-1" size="sm" v-model="data[item.key]"></lay-input>
+				<label v-else-if="item.key == 'FTypeID1'">{{ data["FTypeID1Name"] }}</label>
+				<label v-else-if="item.key == 'FTypeID2'">{{ data["FTypeID2Name"] }}</label>
+				<label v-else-if="item.selectTypeId">{{ data[item.key + "Name"] }}</label>
 				<label v-else="">{{ data[item.key] }}</label>
 			</template>
 		</lay-table>
@@ -349,7 +352,7 @@ export default {
 
 			});
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
-			localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
+			//localStorage.setItem('EditView' + saveId, JSON.stringify(_data.rows));
 
 			console.log('editColumn', editColumn);
 			this.editColumn = editColumn;
@@ -371,6 +374,9 @@ export default {
 				if ($this.dataInfoObj.FCanEdit == 2) {
 					item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
 					item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
+
+
+				
 				}
 				else {
 
@@ -384,9 +390,11 @@ export default {
 					if (!isFTypeID1 && !isFTypeID2) {
 						item.FTypeID1 = fType1 ? fType1.FName : item.FTypeID1;
 						item.FTypeID2 = fType2 ? fType2.FName : item.FTypeID2;
+
 					}
 				}
-
+				item["FTypeID1Name"]=fType1 ? fType1.FName : item.FTypeID1;
+				item["FTypeID2Name"] = fType2 ? fType2.FName : item.FTypeID2;
 
 
 				return item;
@@ -485,18 +493,18 @@ export default {
 				FType: this.dataInfoObj.FType
 			};
 			let saveId = this.dataInfoObj.FViewType + "_" + this.dataInfoObj.FID;
-			let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
-			console.log('cacheDataList', cacheDataList);
+			//let cacheDataList = JSON.parse(localStorage.getItem('EditView' + saveId));
+			//console.log('cacheDataList', cacheDataList);
 			let allTypeSelected = true;
 			this.dataList.forEach((row, index) => {
-				let cache = cacheDataList[index];
+				//let cache = cacheDataList[index];
 				let dataObj = {};
-				if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') {
-					layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 });
-					layer.close(idx);
-					allTypeSelected = false;
-					return
-				}
+				// if (row["FTypeID1"] == -1 || row["FTypeID2"] == -1 || row["FTypeID1"] == '' || row["FTypeID2"] == '') {
+				// 	layer.msg("请先为所有物料选择分类", { icon: 2, time: 1000 });
+				// 	layer.close(idx);
+				// 	allTypeSelected = false;
+				// 	return
+				// }
 				console.log('this.editColumn', this.editColumn);
 				for (let col of this.dataColumn) {
 					let valTemp = row[col.key];
@@ -539,7 +547,7 @@ export default {
 				}, "OperateLog");
 				let $this = this;
 				//$this.initPage();
-				localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
+				//localStorage.setItem('EditView' + saveId, JSON.stringify(this.dataList));
 				setTimeout(function () {
 					layer.close(idx);
 					layer.msg('保存成功');

src/views/half/components/ShowData1.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="box-data">
-		<lay-scroll>
+		<lay-scroll v-if="dataInfoObj.FHeight" :height="dataInfoObj.FHeight+'px'">
 			<lay-container class="dataInfo">
 
 				<lay-row space="10">
@@ -18,7 +18,8 @@
 					</lay-col>
 					<lay-col md="18">
 						<div class="grid-demo" style="text-align: left;">
-							{{ dataInfoObj.FNewTestCode }}+{{ dataInfoObj.FNewVersionCode }}+{{ dataInfoObj.FNewDesc }}</div>
+							{{ dataInfoObj.FNewTestCode }}+{{ dataInfoObj.FNewVersionCode }}+{{ dataInfoObj.FNewDesc }}
+						</div>
 					</lay-col>
 				</lay-row>
 			</lay-container>
@@ -37,7 +38,8 @@
 			</lay-container>
 		</lay-scroll>
 		<lay-layer area="90%" v-model="showEditBox" title="视图查看">
-			<ShowView :viewList="viewList" :viewHeight="viewHeight" :viewType="viewType" @cancelClick="cancelClick"></ShowView>
+			<ShowView :viewList="viewList" :viewHeight="viewHeight" :viewType="viewType" @cancelClick="cancelClick">
+			</ShowView>
 		</lay-layer>
 	</div>
 </template>
@@ -170,7 +172,9 @@ import {
 import {
 	getTeamworkView
 } from "/src/api/api/halfmaterialteamwork";
-
+import {
+	getBasicRoleList
+} from "/src/api/api/user";
 
 import ShowView from './ShowView.vue';
 
@@ -228,7 +232,65 @@ export default {
 
 		//获取视图
 		async _getViewList() {
-			this.dataList = [{ "name": "物料视图", "code": "1", "outCode": "6","seeCode":"1" }, { "name": "配方视图", "code": "2", "outCode": "7","seeCode":"2" }];
+
+			let result = await getBasicRoleList({
+				FRoleType: 39
+
+			}) || [];
+
+			let result2 = await getBasicRoleList({
+				FRoleType: 39,
+				TeamId: this.dataInfoObj.FID,
+				Type: 2
+
+			}) || [];
+			debugger
+			console.log('result', result);
+			console.log('this.dataInfoObj', this.dataInfoObj);
+			let dataList = [];
+			let hasType = "1,2".split(',');
+
+			result.forEach((item) => {
+				let viewData = dataList.find(s => s.name == item.FName) || null;
+				debugger
+				if (viewData == null) {
+					if (hasType.indexOf(item.FCode) != -1) {
+						viewData = {
+							name: item.FName,
+							seeCode: "",
+							outCode: ""
+						};
+						if (result2) {
+							let dataResult = result2.find((x) => {
+								return x.FID == item.FID;
+							})
+							if (dataResult) {
+								if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode;
+								if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode;
+							}
+
+						}
+
+						dataList.push(viewData);
+					}
+				} else {
+					if (result2) {
+						let dataResult = result2.find((x) => {
+							return x.FID == item.FID;
+						})
+						if (dataResult) {
+							if (item.FRemark.indexOf("查看") != -1) viewData.seeCode = item.FCode;
+							if (item.FRemark.indexOf("导出") != -1) viewData.outCode = item.FCode;
+						}
+
+					}
+				}
+			});
+
+			this.dataList = dataList;
+
+
+			//this.dataList = [{ "name": "物料视图", "code": "1", "outCode": "6","seeCode":"1" }, { "name": "配方视图", "code": "2", "outCode": "7","seeCode":"2" }];
 		},
 		async _getTeamworkView(data, type) {
 			let viewType = parseInt(type == 1 ? data.seeCode : data.outCode);

src/views/half/half.vue

@@ -303,7 +303,9 @@ export default {
 			if (data) {
 				data["FTeamID"] = data.FID;
 			}
-			this.objInfoObj = data;
+			let height = document.documentElement.clientHeight || document.body.clientHeight || 1000;
+			this.objInfoObj = data || {};
+			this.objInfoObj["FHeight"] = Math.ceil(height * 0.8);
 
 			this.showEditBox[i] = true;
 		},