改成代理服务器ip以及生产版本增删改

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 希迈系统
 ENV = 'development'
 
 # 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.222.60:8088'
+VUE_APP_BASE_API = '/api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 希迈系统
 ENV = 'production'
 
 # 若依管理系统/生产环境
-VUE_APP_BASE_API = 'http://192.168.222.60:8088'
+VUE_APP_BASE_API = '/prod-api'

src/views/mes/pro/productionSolution/proofingApply.vue

@@ -21,7 +21,13 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['mes:pro:productionSolution:add']">新增
+        </el-button>
+      </el-col>
+    </el-row>
     <el-table v-loading="loading" :data="productionSolutionList" row-key="productionSolutionId" default-expand-all>
       <el-table-column label="生产版本编码" prop="productionSolutionCode">
         <template slot-scope="scope">
@@ -46,7 +52,6 @@
       </el-table-column> -->
 
       <!-- <el-table-column label="备注" align="center" prop="usageName"  width="180"/> -->
-      <!--
       <el-table-column
         label="操作"
         width="200px"
@@ -59,13 +64,15 @@
             size="mini"
             type="text"
             icon="el-icon-edit"
-            v-if="scope.row.status == 'PREPARE'"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['pro:productionSolution:edit']"
-            >确认</el-button
+            >修改</el-button
           >
+          <el-button size="mini" type="text" icon="el-icon-delete"
+            @click="handleDelete(scope.row)" v-hasPermi="['mes:pro:productionSolution:remove']">删除
+          </el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
       @pagination="getList" />
@@ -81,9 +88,6 @@ import {
   //   updatePrototypeRequest,
   //   dofinish,
   listProductionSolution,
-  getProductionSolution,
-  addProductionSolution,
-  updateProductionSolution,
   delProductionSolution,
 } from "@/api/mes/pro/productionSolution";
 import ItemSelect from "@/components/itemSelect/single.vue";
@@ -219,21 +223,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd(row) {
       // 跳转到申请单界面
-      this.$router.push("/mes/proofing/apply");
+      this.$router.push("/mes/pro/productionSolution/apply");
       return;
-      //   this.reset();
-      //   this.getTreeselect();
-      //   if (row != null && row.prototypeRequestId) {
-      //     this.form.parentId = row.prototypeRequestId;
-      //     this.form.orderSource = row.orderSource;
-      //     this.form.sourceCode = row.sourceCode;
-      //     this.form.clientId = row.clientId;
-      //     this.form.clientCode = row.clientCode;
-      //     this.form.clientName = row.clientName;
-      //   } else {
-      //     this.form.parentId = 0;
-      //   }
-      //   this.open = true;
     },
     // 查询明细按钮操作
     handleView(row) {
@@ -269,9 +260,9 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       this.$modal
-        .confirm('是否确认删除编号为"' + row.prototypeRequestId + '"的打样单？')
+        .confirm('是否确认删除编号为"' + row.productionSolutionCode + '"的生产版本？')
         .then(function () {
-          return delPrototypeRequest(row.prototypeRequestId);
+          return delProductionSolution(row.productionSolutionId);
         })
         .then(() => {
           this.getList();

src/views/mes/pro/productionSolution/proofingInfo.vue

@@ -4,8 +4,8 @@
       {{ pageTitle }}
       <!-- 申请按钮显示 -->
       <template slot="buttons" v-if="mode == 'apply'">
-        <!-- <el-button size="mini" @click="resetForm">重置</el-button>
-        <el-button size="mini" type="primary" @click="saveForm">提交</el-button> -->
+        <el-button size="mini" @click="resetForm">重置</el-button>
+        <el-button size="mini" type="primary" @click="saveForm">提交</el-button>
       </template>
 
       <!-- 修改 按钮显示 -->
@@ -142,9 +142,9 @@ import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
 import { listRouteprocess } from "@/api/mes/pro/routeprocess";
 import tabPlugins from "@/plugins/tab";
 import {
-  // addPrototypeRequest,
+  addProductionSolution,
   // getPrototypeRequest,
-  // updatePrototypeRequest,
+  updateProductionSolution,
   getProductionSolution,
   submitProductionSolution,
 } from "@/api/mes/pro/productionSolution";
@@ -210,9 +210,9 @@ export default {
     },
     pageTitle() {
       const titles = {
-        edit: "生产版本确认",
+        edit: "生产版本修改",
         info: "生产版本详情",
-        apply: "生产版本申请",
+        apply: "生产版本新增",
       };
       return titles[this.mode];
     },
@@ -290,7 +290,7 @@ export default {
       };
       this.loading = true;
       if (this.mode == "apply") {
-        addPrototypeRequest(params)
+        addProductionSolution(params)
           .then((res) => {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");
@@ -302,7 +302,7 @@ export default {
             this.loading = false;
           });
       } else {
-        submitProductionSolution(params)
+        updateProductionSolution(params)
           .then(() => {
             this.loading = false;
             this.$modal.msgSuccess("提交成功！");

vue.config.js

@@ -36,8 +36,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         // target: `http://localhost:8080`,
-        // target: `http://192.168.222.60:9081/mesApi`,
-        target: `http://192.168.222.60:8088`,
+        target: `http://192.168.222.60:9092/mesApi`,
+        // target: `http://192.168.222.60:8088`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''