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

2019-01-29 15:29:33 +08:00
parent f2601e7c4e d7e8fab01c
commit fe445114a2
7 changed files with 100 additions and 163 deletions
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -1,5 +1,41 @@
 import request from '@/utils/request'

+// 典艺查询<高精原有数据>
+export function searchProcess11(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺查询_MESWORK',
+      param: '零件图号=' + num
+    }
+  })
+}
+// 典艺查询<高精原有数据>
+export function numChange(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_原零件工艺明细查询_MESWORK',
+      param: '典艺流水号=' + num
+    }
+  })
+}
+// 保存主表工艺
+export function selectRequest(num0, num1, num2, num3, request0) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
+      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
+    }
+  })
+}
 // 初始化 工艺员A
 export function initCraftmen() {
  return request({
@@ -322,18 +358,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num
    }
  })
 }
-// 选择工艺要求
-export function selectRequest(num0, num1, num2, num3, request0) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号',
-      param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0
-    }
-  })
-}
+
 // 粘贴
 export function pasteTable(oldNum, newNum) {
  return request({
--- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js
+++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js
@@ -17,7 +17,7 @@ export function getMachines() {
    method: 'post',
    data: {
      type: '1',
-      name: '车间生产管理工艺_传递后_机床名称_根据机床查询',
+      name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询',
      param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int'
    }
  })
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
  // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
  // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
  // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
  timeout: 1500000 // 请求超时时间
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -82,8 +82,8 @@
            <span>长度:</span>
            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
-            ∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>
+            <!--∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ ()-->
+            <!--<el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="insertThestring()">计算重量</el-button>-->
          </el-col>

          <el-col v-show="materielValue==='2'||materielValue==='9'||materielValue==='10'||materielValue==='11'" :span="20">
@@ -144,16 +144,11 @@
        <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-document" @click="pasteTable">粘贴</el-button>
-          <el-button v-if="false" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">典艺
-          </el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺
-          </el-button>
-          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
-          </el-button>
-          <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 v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有</el-button>
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">完艺</el-button>
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除</el-button>
+          <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>
      <el-table
@@ -306,72 +301,29 @@
      </el-form>
    </el-dialog>

-    <el-dialog :visible.sync="dialogFormVisible" title="典型工艺选择" center width="800px">
+    <el-dialog :visible.sync="dialogFormVisible" title="工艺选择" center width="800px">
      <el-form ref="form" :model="form" label-position="left" label-width="125px" class="demo-ruleForm">
        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺零件分类">
-              <el-select
-                v-model="typicalClassValue"
-                placeholder="分类"
-                size="small"
-                style="width:150px"
-                @change="classChange()">
-                <el-option
-                  v-for="item in typicalClass"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-input v-model="partNameValue1" size="small" placeholder="输入零件图号" style="width: 150px" clearable/>
+              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 20px" @click="searchProcess()">查询</el-button>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
-            <el-form-item label="零件名称">
-              <el-select
-                id="name"
-                v-model="partNameValue1"
-                placeholder="零件名称"
-                size="small"
-                style="width:150px"
-                @change="nameChange()">
-                <el-option
-                  v-for="item in partName1"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button type="success" size="small" icon="el-icon-search" @click="searchProcess()">查询</el-button>
-          </el-col>
        </el-row>
        <el-row>
-          <el-col :span="10">
-            <el-form-item label="典型工艺号">
-              <el-select
-                id="num"
-                v-model="processNumValue"
-                placeholder="工艺号"
-                style="width:150px"
-                size="small"
-                @change="numChange()">
+          <el-col :span="24">
+            <el-form-item label="零件图号">
+              <el-select id="num" v-model="processNumValue" placeholder="零件图号" style="width:150px" size="small" @change="numChange()">
                <el-option
                  v-for="item in partName1"
                  :key="item.value"
-                  :label="item.num"
+                  :label="item.label"
                  :value="item.value"/>
              </el-select>
+              <el-button size="small" style="margin-left: 20px" @click="processCopy()">工艺拷贝</el-button>
            </el-form-item>
          </el-col>
-          <el-col :span="10">
-            <el-form-item label="备注">
-              <el-input v-model="remark" size="small" readonly style="width: 150px;"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="4">
-            <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
-          </el-col>
        </el-row>
        <el-table
          :data="tableData2"
@@ -381,7 +333,7 @@
          size="mini">
          <el-table-column align="center" label="工艺序号" width="80">
            <template slot-scope="scope">
-              {{ scope.row.工艺序号 }}
+              {{ scope.row.工序顺序 }}
            </template>
          </el-table-column>
          <el-table-column align="center" label="工艺名称" width="180">
@@ -472,12 +424,7 @@
            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
          </el-col>
        </el-row>
-        <el-table
-          :data="tableData4"
-          style="width: 97%;max-height: 250px;margin-top: 15px"
-          size="mini"
-          border
-          height="250px">
+        <el-table :data="tableData4" style="width: 97%;max-height: 250px;margin-top: 15px" size="mini" border height="250px">
          <el-table-column align="center" label="工艺序号" width="80">
            <template slot-scope="scope">
              {{ scope.row.工序顺序 }}
@@ -552,6 +499,8 @@
 <script>
 import '@/icon/iconfont.css'
 import {
+  numChange,
+  searchProcess11,
  WeightCopy,
  initCraftmen,
  getPartnames1,
@@ -562,8 +511,6 @@ import {
  searchMaterial,
  typicalProcess,
  initTolerance,
-  FcK,
-  searchProcess,
  searchWYgongyi,
  gongyiCopy,
  initPerson,
@@ -1099,67 +1046,29 @@ export default {
      this.remark1 = ''
      this.tuhaoValue = ''
    },
-    classChange() { // 当分类改变时，获取零件名称和典型工艺流水号
-      this.partNameValue1 = ''
+    // 典艺工艺查询
+    searchProcess() {
      this.processNumValue = ''
-      for (let i = 0; i < this.typicalClass.length; i++) {
-        if (this.typicalClassValue === this.typicalClass[i].value) {
-          this.serialNumValue1 = this.serialNum1[i].value
-          FcK(this.serialNumValue1).then(response => {
      this.partName1 = []
-            this.processNum = []
-            this.remark = response.data[0].备注
-            for (let j = 0; j < response.data.length; j++) {
-              this.partName1.push({
-                label: response.data[j].典型工艺名称,
-                num: response.data[j].典型工艺号,
-                value: response.data[j].典型工艺流水号
-              })
-            }
-          })
-        }
-      }
-    },
-    nameChange() { // 当零件名称改变时，典型工艺号改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.partNameValue1 === this.partName1[i].value) {
-          this.processNumValue = this.partName1[i].num
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    numChange() { // 当典型工艺号改变时，零件名称改变
-      for (let i = 0; i < this.partName1.length; i++) {
-        if (this.processNumValue === this.partName1[i].value) {
-          this.partNameValue1 = this.partName1[i].value
-          this.serialNumValue2 = this.partNameValue1
-        }
-      }
-    },
-    searchProcess() { // 典艺工艺查询
-      if (this.typicalClassValue === '') {
-        this.serialNumValue1check = false
-      } else {
-        this.serialNumValue1check = true
-      }
-
-      if (this.partNameValue1 === '') {
-        this.partNameValue1check = false
-      } else {
-        this.partNameValue1check = true
-      }
-
-      if (this.processNumValue === '') {
-        this.processNumValuecheck = false
-      } else {
-        this.processNumValuecheck = true
-      }
      this.tableData2 = []
-      searchProcess(this.serialNumValue1check, this.serialNumValue1, this.partNameValue1check, this.serialNumValue2, this.processNumValuecheck, this.serialNumValue2).then(response => {
-        this.tableData2 = response.data
+      searchProcess11(this.partNameValue1).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partName1.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].典艺流水号
+          })
+        }
      })
    },
-    processCopy() { // 典艺工艺拷贝
+    // 典艺选择查表格
+    numChange() {
+      numChange(this.processNumValue).then(response => {
+        this.tableData2 = response.data
+        console.log(this.tableData2)
+      })
+    },
+    // 典艺工艺拷贝
+    processCopy() {
      if (this.partNumValue === '') {
        this.$message.error('请在主界面选择一个零件作为被拷贝对象')
        this.dialogFormVisible = false
@@ -1170,12 +1079,11 @@ export default {
          this.tableData[i].工艺名称 = this.tableData2[i].工艺名称
          this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
          this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
-          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
-          })
-          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
-          })
-          this.dialogFormVisible = false
+          console.log(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求)
+          selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求)
+          hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级)
        }
+        this.dialogFormVisible = false
      }
    },
    searchProcess1() { // 完艺工艺查询
@@ -1310,8 +1218,7 @@ export default {
      this.str = this.str + this.processRequestValue
      this.tableData[this.index].工艺要求 = this.str
      this.dialogFormVisible2 = false
-      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
-      })
+      selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求)
    },
    calTol() { // 计算公差
      this.tolerance = ''
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -122,7 +122,6 @@
        :data="tableData10"
        :cell-class-name="cell"
        style="width: 100%"
-        height="440"
        size="mini"
        highlight-current-row
        border>
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -131,6 +131,7 @@
        border>
        <el-table-column
          label="序号"
+          align="center"
          type="index"
          width="50"/>
        <el-table-column align="center" label="物料名称">
--- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
+++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
@@ -331,6 +331,8 @@ export default {
      this.searchTable1()
    },
    requestFund(row) { // 请款
+      console.log(row.本次应请款)
+      if (row.本次应请款 !== '') {
        const day1 = new Date()
        const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate()
        requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => {
@@ -342,6 +344,9 @@ export default {
            this.tableData2 = []
          } else { this.$message.error('请款失败') }
        })
+      } else {
+        this.$message.warning('请输入金额')
+      }
    },
    cancelRequestFund(row) { // 取消请款
      console.log(row)