Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory_web

src/views/wpm_bx/mlog_form.vue

@@ -60,8 +60,8 @@
 								</el-select>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="base_code=='tcerp'||route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
-							<el-form-item label="生产设备" prop="equipment">
+							<el-form-item label="生产设备" :prop="base_code!=='tcerp' ? 'equipment' : null">
 								<el-select
 									v-model="form.equipment"
 									placeholder="生产设备"
@@ -315,6 +315,7 @@ export default {
 			mtaskOptions:[],
 			supplierOptions: [],
 			setFiltersVisible: false,
+			base_code: this.$TOOL.data.get('BASE_INFO').base.base_code,
 		};
 	},
 	mounted() {

src/views/wpm_bx/mlog_form2.vue

@@ -66,8 +66,8 @@
 								<el-input-number v-model="form.count_use" :disabled="materialTracking==20" style="width: 100%;"></el-input-number>
 							</el-form-item>
 						</el-col>
-						<el-col :md="12" :sm="12" :xs="24" v-if="route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
+						<el-col :md="12" :sm="12" :xs="24" v-if="base_code=='tcerp'||route_code=='ladansi'||route_code=='yicifusi'||route_code=='ercifusi'||route_code=='zlybcl'||route_code=='djg'||route_code=='cnc'">
-							<el-form-item label="生产设备" prop="equipment">
+							<el-form-item label="生产设备" :prop="base_code!=='tcerp' ? 'equipment' : null">
 								<el-select
 									v-model="form.equipment"
 									placeholder="生产设备"
@@ -292,6 +292,7 @@ export default {
 			routeOptions: [],
 			materialOptions: [],
 			routeOriginOptions: [],
+			base_code: this.$TOOL.data.get('BASE_INFO').base.base_code,
 		};
 	},
 	mounted() {