合并dev

src/config/setting.js

@@ -2,7 +2,7 @@
 export const API_BASE_URL = process.env.VUE_APP_API_BASE_URL;
 
 // 项目名称
-export const PROJECT_NAME = process.env.VUE_APP_NAME;
+export const PROJECT_NAME = '';
 
 // 不显示侧栏的路由
 export const HIDE_SIDEBARS = [];

src/views/productionPlan/components/detail/productionDetail.vue

@@ -29,7 +29,7 @@
             width: '80'
           },
           {
-            prop: 'total1',
+            prop: 'total',
             label: '排程数量(块)'
           },
           {

src/views/saleOrder/components/order-search.vue

@@ -70,6 +70,11 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <el-form-item label="产品名称:">
+          <el-input v-model="where.productName" placeholder="请输入"></el-input>
+        </el-form-item>
+      </el-col>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
         <el-form-item label="交货日期:">
@@ -144,7 +149,8 @@ export default {
       orderType: 0,
       proStu: '',
       orderLibraryType: 0,
-      salesman: ''
+      salesman: '',
+      productName:''
     };
     return {
       fileUrl,