Merge branch 'develop' into xuxiaoming

.env.prod

@@ -1,5 +1,5 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://101.201.121.115:9003/
+VUE_APP_BASE_URL = http://10.11.12.27:9003/
 VUE_APP_TITLE = 生产计划管理系统
 VUE_APP_LOGO = ../assets/img/logo.png
 VUE_APP_LOGIN_BG = ../assets/img/bg-login.png

.env.test

@@ -1,5 +1,5 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = http://10.11.3.207:9003/
+VUE_APP_BASE_URL = http://10.11.12.27:9003/
 VUE_APP_TITLE = 生产计划管理系统
 VUE_APP_LOGO = ../assets/img/logo.png
 VUE_APP_LOGIN_BG = ../assets/img/bg-login.png

src/components/queryComponent/index.vue

@@ -11,7 +11,7 @@
 				<img :src="notalReadyPic" alt="" title="检索条件">
 			</template>
 			<div class="predict-search-container">
-				<el-select v-if="isShowAddButton"
+				<!-- <el-select v-if="isShowAddButton"
 					v-model="valid"
 					style="width: 300px;margin-bottom:10px;"
 					placeholder="请选择是否有效" >
@@ -21,8 +21,13 @@
 						:label="item['label']"
 						:value="item['value']">
 					</el-option>
-				</el-select>
-				<el-select v-if="isShowAddButton"
+				</el-select> -->
+				<div v-if="isShowAddButton" style="height: 40px;">
+					<span style="margin-right:10px;">是否有效：</span>
+					<el-radio v-model="valid" label="true">有效</el-radio>
+					<el-radio v-model="valid" label="false">无效</el-radio>
+				</div>
+				<!-- <el-select v-if="isShowAddButton"
 					v-model="status"
 					style="width: 300px;margin-bottom:10px;"
 					placeholder="请选择是否发布" >
@@ -32,7 +37,12 @@
 						:label="item['label']"
 						:value="item['value']">
 					</el-option>
-				</el-select>
+				</el-select> -->
+				<div v-if="isShowAddButton" style="height: 40px;">
+					<span style="margin-right:10px;">是否发布：</span>
+					<el-radio v-model="status" label="0">未发布</el-radio>
+					<el-radio v-model="status" label="1">已发布</el-radio>
+				</div>
 				<el-input
 					v-if="isShowAddButton"
 					v-model="VersionID"

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/index.vue

@@ -415,7 +415,7 @@ export default {
         },2000)
         this.$message({ type: "success", message: msg });
       }).catch(() => {
-        this.$message({ type: "error", message: "访问失败" });
+        // this.$message({ type: "error", message: "访问失败" });
       });
     },
     // 保存数据

src/views/productionPlanning/customerForecastDemandReview/demandPlanning/articleDemand/public.vue

@@ -99,7 +99,7 @@
           this.$emit("cancelHandle", "submit")
         }).catch(() => {
           this.loading = false
-          this.$message({ type: "error", message: "发布失败" });
+          // this.$message({ type: "error", message: "发布失败" });
         });
       }
     },