Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_AdvancedPlanner_Front into wangxy

.gitignore

@@ -2,7 +2,7 @@
 node_modules
 /dist
 
-
+yarn.lock
 # local env files
 .env.local
 .env.*.local

src/server/mock/index.js

@@ -2,7 +2,7 @@ import Mock from 'mockjs'
 import * as login from './modules/login.js'
 
 // 可以通过 isOpen 参数设置是否拦截整个模块的 mock 功能
-fnCreate(login, true)
+fnCreate(login, false)
 
 /**
  * 创建mock模拟数据
@@ -17,9 +17,6 @@ function fnCreate(mod, isOpen = true) {
                     Mock.mock(new RegExp(res.url), res.type, (opts) => {
                         opts['data'] = opts.body ? JSON.parse(opts.body) : null
                         delete opts.body
-                        console.log('\n')
-                        console.log('%cmock拦截, 请求: ', 'color:blue', opts)
-                        console.log('%cmock拦截, 响应: ', 'color:blue', res.data)
                         return res.data
                     })
                 }

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

@@ -135,6 +135,19 @@
                 </el-form-item>
                 </el-col>
             </el-row>
+
+            <el-row>
+                <el-col :span="12">
+                <el-form-item
+                    :label="getColumnName('AP_MpsSetting-SalesOrderFetchLeadTimeByDay')"
+                    prop="AP_MpsSetting-SalesOrderFetchLeadTimeByDay">
+                    <el-input
+                    v-model.number="formData['AP_MpsSetting-SalesOrderFetchLeadTimeByDay']"
+                    placeholder="请输入"
+                    />
+                </el-form-item>
+                </el-col>
+            </el-row>
         </el-form>
         <template #footer>
         <span class="dialog-footer">

src/views/productionPlanning/productInventory/index.vue

@@ -56,10 +56,8 @@ export default {
                 "ArticleStock-ArtId",
                 "ArticleStock-Descr",
                 "ArticleStock-FGQty",
-                "ArticleStock-SFGQty",
                 "ArticleStock-WIPQty",
                 "ArticleStock-PUCQty",
-                "ArticleStock-OSCQty"
             ],
             articleList:[],
             syncDataDisable:false,