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

src/views/System/components/EditFactory.vue

@@ -1,6 +1,6 @@
 <template>
 	<lay-form :model="factoryInfo" style="max-width:96%; margin:30px 0;" @click.stop="stopClick">
-		<lay-form-item label="工厂名称" prop="FName" required>
+		<lay-form-item label="模式名称" prop="FName" required>
 			<lay-input v-model="factoryInfo.FName"></lay-input>
 		</lay-form-item>
 		<lay-form-item label="工厂编号" prop="FCode" required>
@@ -23,7 +23,7 @@
 		<lay-form-item label="手机号" prop="FPhone">
 			<lay-input v-model="factoryInfo.FPhone"></lay-input>
 		</lay-form-item>
-		<lay-form-item label="工厂状态" prop="FState" required>
+		<lay-form-item label="模式状态" prop="FState" required>
 			<view required v-for="(sIdv,sIdx) in stateLists" key="sIdx">
 				<lay-radio v-model="factoryInfo.FState" name="FState" :value="sIdv.FValue">{{ sIdv.FName }}</lay-radio>
 			</view>

src/views/System/components/PowerRole.vue

@@ -36,7 +36,7 @@
 			</lay-tab-item>
 			<lay-tab-item title="物料视图编辑" id="4">
 				<lay-collapse v-model="openKeys4" v-for="(mIdv,mIdx) in termEditList" :key="mIdx">
-					<lay-collapse-item :title="mIdv.FName" :id="mIdv.FID">
+					<lay-collapse-item v-if="mIdv.FName != '物料编辑视图'" :title="mIdv.FName" :id="mIdv.FID">
 						<lay-checkbox name="menu" skin="primary" v-model="mIdv.FIsChose" :value="mIdv.FID" label="全部"
 							@change="_changeMenu(mIdv,null,1)"></lay-checkbox>
 						<lay-checkbox name="menu" skin="primary" v-model="cIdv.FIsChose" :value="cIdv.FID"

src/views/System/factory.vue

@@ -262,8 +262,8 @@
 			},
 			//操作工厂信息
 			_changeFactory(factoryObj) {
-				if (factoryObj) this.editBoxTitle = "修改工厂";
+				if (factoryObj) this.editBoxTitle = "修改模式";
-				else this.editBoxTitle = "添加工厂";
+				else this.editBoxTitle = "添加模式";
 				this.showEditBox = true;
 				this.factoryInfoObj = factoryObj || {};
 			},