产线调整提交

src/views/factoryModel/productionLine/components/edit.vue

@@ -284,6 +284,7 @@
 <script>
 import { saveOrUpdate, listWorkshopByParentId } from '@/api/factoryModel';
 import { getUserPage } from '@/api/system/organization';
+import { deepClone } from '@/components/FormGenerator/utils';
 import { cityDataLabel } from 'ele-admin/packages/utils/regions';
 export default {
   props: {
@@ -452,8 +453,9 @@ export default {
         if (this.type == 'add') {
           delete this.form.id;
         }
-        this.form.mainFactoryCapacityList = this.form.mainFactoryCapacityList.concat(this.delList)
-        saveOrUpdate(this.form)
+        let params = deepClone(this.form)
+        params.mainFactoryCapacityList = params.mainFactoryCapacityList.concat(this.delList)
+        saveOrUpdate(params)
           .then((msg) => {
             this.loading = false;
             this.$message.success(msg);

src/views/factoryModel/station/components/edit.vue

@@ -172,6 +172,24 @@
               </el-select>
             </el-form-item>
           </el-col>
+          
+         <el-col :span="8">
+            <el-form-item label="状态:" prop="enabled">
+              <el-select
+                v-model="form.enabled"
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in options.enabled"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="14">
             <el-form-item label="节拍时间:" prop="extInfo.meterTime">
               <div class="workMeter-warp">
@@ -213,23 +231,6 @@
             </el-form-item>
           </el-col>
 
-<!--          <el-col :span="8">
-            <el-form-item label="状态:" prop="enabled">
-              <el-select
-                v-model="form.enabled"
-                placeholder="请选择"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in options.enabled"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
 
           <el-col :span="24">
             <el-form-item label="备注:" prop="remark">

vue.config.js

@@ -32,10 +32,10 @@ module.exports = {
       // 当我们的本地的请求 有/api的时候，就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
         // target: 'http://192.168.3.51:18086', // 测试
-        target: 'http://192.168.3.35:8080', // kang杨威
+        // target: 'http://192.168.3.35:8080', // kang杨威
         // 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.33:8080', // 谢一平
         // target: 'http://192.168.3.64:8080', // 粟勋
         // target: 'http://192.168.3.34:8080', // 刘毅
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域