bug

src/views/materialPlan/components/materialPlan-search.vue

@@ -66,7 +66,6 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
           >
           </el-date-picker>
         </el-form-item>
@@ -83,8 +82,7 @@
             range-separator="至"
             start-placeholder="开始日期"
             end-placeholder="结束日期"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
         </el-form-item>

src/views/materialPlan/workOrderPublish.vue

@@ -143,7 +143,7 @@
         ],
         infoData: {},
         orderList: [],
-        planType: ['内销计划', '外销计划'],
+        planType: ['', '内销计划', '外销计划', '预制计划'],
         id: null
       };
     },

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

@@ -6,7 +6,7 @@
         productionPlan.code
       }}</el-descriptions-item>
       <el-descriptions-item label="计划生产数量">{{
-        productionPlan.planProductNum
+        productionPlan.requiredFormingNum
       }}</el-descriptions-item>
       <!-- <el-descriptions-item label="已交货数量">已交货数量</el-descriptions-item>
       <el-descriptions-item label="未交货数量">未交货数量</el-descriptions-item> -->
@@ -14,7 +14,7 @@
         productionPlan.createUserName
       }}</el-descriptions-item>
       <el-descriptions-item label="计划类型">{{
-        ['内销计划', '外销计划'][productionPlan.planType]
+        ['', '内销计划', '外销计划', '预制计划'][productionPlan.planType]
       }}</el-descriptions-item>
       <el-descriptions-item label="计划生产重量">{{
         productionPlan.code
@@ -25,7 +25,7 @@
         productionPlan.createTime
       }}</el-descriptions-item>
       <el-descriptions-item label="计划完成日期">{{
-        productionPlan.planFormingTime
+        productionPlan.planDeliveryTime
       }}</el-descriptions-item>
       <el-descriptions-item label="要求成型数量">{{
         productionPlan.requiredFormingNum
@@ -165,11 +165,13 @@
           {
             prop: 'orderLibraryType',
             label: '按单按库',
-            formatter: (row) => ['按单', '安库'][row.orderLibraryType]
+            formatter: (row) => ['', '按单', '按库'][row.orderLibraryType]
           },
           {
             prop: 'deliveryRequirements',
-            label: '交付要求'
+            label: '交付要求',
+            formatter: (row) =>
+              ['', '普通', '紧急', '重要'][row.deliveryRequirements]
           },
           {
             prop: 'orderType',

src/views/productionPlan/workOrderPublish.vue

@@ -148,7 +148,7 @@
         ],
         infoData: {},
         orderList: [],
-        planType: ['内销计划', '外销计划'],
+        planType: ['', '内销计划', '外销计划', '预制计划'],
         id: null
       };
     },

src/views/saleOrder/salesToProduction.vue

@@ -41,13 +41,13 @@
           <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
             <el-form-item label="产线:">
               <!-- <el-input
-                v-model="form.productline"
+                v-model="form.productLine"
                 placeholder="选择生产版本带入"
                 readonly
               ></el-input> -->
               <el-select
                 placeholder="选择生产版本带入"
-                v-model="form.productline"
+                v-model="form.productLine"
               >
                 <el-option
                   v-for="(item, index) in lineNamesList"
@@ -335,7 +335,7 @@
         form: {
           planType: 1,
           produceVersionId: '',
-          productline: '',
+          productLine: '',
           salesOrders: [],
           produceVersionName: ''
         },
@@ -485,7 +485,7 @@
         this.$set(this.form, 'produceVersionId', data.produceVersionId);
         this.$set(
           this.form,
-          'productline',
+          'productLine',
           data.lineNames.length ? data.lineNames[0] : ''
         );
         this.lineNamesList = Array.from(new Set(data.lineNames || []));

vue.config.js

@@ -31,12 +31,12 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.3.35:8080', // kang杨威
+        target: 'http://192.168.3.35:8080', // kang杨威
         // target: 'http://192.168.3.38:8080', // 陈潇
         // target: 'http://192.168.3.25:8080', // 黄峥嵘
         // target: 'http://192.168.3.41:8080', // 何江鹏
         // target: 'http://192.168.3.33:8080', // 谢一平
-        target: 'http://192.168.3.51:18086', // 测试环境
+        // target: 'http://192.168.3.51:18086', // 测试环境
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {