ysy před 1 rokem
rodič
revize
597cff849b

+ 1 - 1
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 = ''; //  process.env.VUE_APP_NAME;
 
 // 不显示侧栏的路由
 export const HIDE_SIDEBARS = [];

+ 9 - 1
src/views/saleOrder/components/order-search.vue

@@ -69,6 +69,13 @@
           <el-input v-model="where.salesman" placeholder="请输入"></el-input>
         </el-form-item>
       </el-col>
+
+      <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>
     <el-row :gutter="15">
       <el-col v-bind="styleResponsive ? { lg: 12, md: 12 } : { span: 12 }">
@@ -144,7 +151,8 @@ export default {
       orderType: 0,
       proStu: '',
       orderLibraryType: 0,
-      salesman: ''
+      salesman: '',
+      productName: ''
     };
     return {
       fileUrl,

+ 5 - 2
src/views/saleOrder/salesToProduction.vue

@@ -395,9 +395,11 @@
           produceRoutingName: '',
           marginCoefficient: '1.0',
           batchNo: null,
-          marginList: []
+       
         },
 
+        marginList: [],
+
         // 表单验证规则
         rules: {
           produceRoutingName: [
@@ -688,7 +690,8 @@
                   data.workOrder.productionPlanId = params.id;
                 }
 
-                await releaseSave(data)
+                await  releaseSave(data)
+                (data)
                   .then((res) => {
                     if (res === 1) {
                       this.$message.success('工单已发布!');