Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/Inventory/InventoryManagement.js

@@ -12,14 +12,14 @@ export function initWarehouse() {
   })
 }
 // 增加仓库
-export function addWarehouse(num0, num1, num2, num3, num4) {
+export function addWarehouse(num0, num1, num2, num3, num4, num5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_货位仓库_仓库_增加数据',
-      param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num4
+      param: '仓库编号=' + num0 + '&仓库名称=' + num1 + '&仓库描述=' + num2 + '&地址=' + num3 + '&联系人=' + num4 + '&备注=' + num5
     }
   })
 }

src/api/Inventory/OfflinePurchase.js

@@ -74,14 +74,14 @@ export function addRequestCardDetail(data1, data2) {
   })
 }
 // 请购单明细修改
-export function alterNumber(data1, data2, data3) {
+export function alterNumber(data2, data3) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_离线请购单_请购单明细修改',
-      param: '离线请购单流水号=' + data1 + '&离线请购单明细流水号组=' + data2 + '&数量组=' + data3
+      param: '离线请购单明细流水号组=' + data2 + '&数量组=' + data3
     }
   })
 }

src/api/Inventory/PartOut.js

@@ -98,14 +98,14 @@ export function ErrorOut(data1, data2, data3, data4, data5, data6, data7, data8,
   })
 }
 // 交换出库
-export function ExchangePartOut(data1, data2, data3, data4, data5) {
+export function ExchangePartOut(data0, data1, data2, data3, data4, data5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_交换件出库_修改数据',
-      param: '采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
+      param: '交换单流水号=' + data0 + '&采购合同明细流水号=' + data1 + '&领用者=' + data2 + '&出库数量=' + data3 + '&货位流水号=' + data4 + '&备注=' + data5
     }
   })
 }

src/api/ManufacturingCenter/ProcessPlanning.js

@@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号',
+      name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号',
-      param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int'
+      param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int'
     }
   })
 }

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/Inventory/InventoryCheck/index.vue

@@ -1734,6 +1734,7 @@ export default {
       })
     },
     AlterNumber(row) {
+      this.form2 = []
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号
@@ -1752,6 +1753,7 @@ export default {
       this.material = row.材料
     },
     AlterBasicNumber(row) {
+      this.form2 = []
       this.project = row.项目流水号
       this.machinenumber = row.机床流水号
       this.partnumber = row.组件流水号

src/views/Inventory/OfflinePurchase/index.vue

@@ -568,7 +568,7 @@ export default {
           this.partGroup.push(this.tableData3[i].离线请购单明细流水号)
           this.numGroup.push(this.tableData3[i].数量)
         }
-        alterNumber(this.purchasecardnumber, this.partGroup, this.numGroup).then(response => {
+        alterNumber(this.partGroup, this.numGroup).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('请购单生成成功')
             this.searchTable2()

src/views/Inventory/PartOut/index.vue

@@ -289,10 +289,9 @@ export default {
     // 查询交换单
     searchExchange() {
       ExchangeOut(this.pickingListNumberx).then(response => {
-        console.log(response.data, 2233455)
         const data = response.data
         for (let i = 0; i < data.length; i++) {
-          data[i].审批通过 === 0 ? data[i].是否禁用 = true : data[i].是否禁用 = false
+          data[i].是否出库 === 1 ? data[i].是否禁用 = true : data[i].是否禁用 = false
         }
         this.tableDataExchange = data
       })
@@ -364,7 +363,7 @@ export default {
       this.dialogFormVisible = false
     },
     execExchangePartOut(row) {
-      ExchangePartOut(row.采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
+      ExchangePartOut(row.交换单流水号, row.被交换件采购合同明细流水号, row.申请人, row.交换数量, row.被交换货位流水号, row.备注).then(response => {
         if (response.data[0].result === '1') {
           this.$message.success('出库成功')
           this.dialogFormVisible = false

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -5,13 +5,13 @@
 
       <el-col :span="12">
         <el-form label-width="270px" label-position="right" class="Time">
-          <el-form-item>
+          <el-form-item v-show="false">
             <el-radio-group v-model="radio" size="small">
               <el-radio :label="0">正常件投产</el-radio>
               <el-radio :label="1">整改件投产</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="项目名称">
+          <el-form-item label="项目名称" style="margin-top:28px">
             <el-select v-model="entryNameValue" filterable size="small" style="margin-bottom:10px" placeholder="项目名称" @change="typeChange()">
               <el-option
                 v-for="item in entryName"

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;
   }

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -47,8 +47,7 @@
       <el-table
         ref="multipleTable"
         :data="tableData"
-        style="width: 100%;max-height: 440px;"
+        style="width: 100%;height: 550px;"
-        height="440"
         highlight-current-row
         border
         @selection-change="handleSelectionChange">

src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue

@@ -201,11 +201,11 @@
               {{ 机加工结束时间[scope.$index] }}
             </template>
           </el-table-column>
-          <el-table-column label="是否预计外协" align="center" width="110">
+          <!--<el-table-column label="是否预计外协" align="center" width="110">-->
-            <template slot-scope="scope">
+          <!--<template slot-scope="scope">-->
-              {{ 预计外协[scope.$index] }}
+          <!--{{ 预计外协[scope.$index] }}-->
-            </template>
+          <!--</template>-->
-          </el-table-column>
+          <!--</el-table-column>-->
           <el-table-column label="零件加工计划进度（工艺名称、计划日期、工序工时）" align="">
             <el-table-column label="[1]" align="center" width="120px">
               <template slot-scope="scope">