零件工艺制定

src/utils/request.js

@@ -19,7 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -43,9 +43,10 @@
       </el-select>
       <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
       </el-button>
+      <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
       <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
       </el-button>
-      <el-button v-show="!isShow2" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
+      <el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式
       </el-button>
       <div v-show="isShow">
         <span>种类:</span>
@@ -57,9 +58,8 @@
           <el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
           <el-button slot="append" icon="el-icon-cjn-09" @click="saveMaterial"/>
         </el-input>
-        <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
         <span>规格:</span>
-        <el-input v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
+        <el-input v-show="false" v-model="spec" :readonly="isShow2" style="width:100px" size="small" placeholder="规格"/>
         <span>投产总数量:</span>
         <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
       </div>
@@ -81,8 +81,6 @@
         <el-input v-model="tolerance" size="small" style="width:150px" placeholder="公差"/>
         <el-button style="margin:10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin: 10px">
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
-          </el-button>
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴</el-button>
           <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
           </el-button>
@@ -90,7 +88,9 @@
           </el-button>
           <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
           </el-button>
-          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
+          <el-button v-if="isShow1" type="primary" size="small" icon="el-icon-tickets" @click="copyAndSave">复制并保存
+          </el-button>
+          <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-tickets" @click="saveApprove">保存
           </el-button>
         </el-button-group>
       </el-row>
@@ -353,10 +353,9 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="零件号">
-              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
+              <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" clearable @change="inputChange"/>
             </el-form-item>
           </el-col>
-
         </el-row>
         <el-row>
           <el-col :span="10">
@@ -834,6 +833,8 @@ export default {
     },
     WYbtn() { // 完艺按钮
       this.tableData4 = []
+      this.tuhaoValue = ''
+      this.remark1 = ''
       this.dialogFormVisible1 = true
     },
     selectPerson(row) { // 选择工艺员
@@ -1218,20 +1219,15 @@ export default {
   .doing-row4 {
     background: #f0f9eb;
   }
-
   .el-card {
     margin-bottom: 15px;
   }
-
   .el-date-editor {
     width: 150px
   }
-
   span {
     margin: 10px 0 10px 10px;
   }
-</style>
-<style>
   .el-table .change {
     background: oldlace;
   }