更新

2019-05-13 16:00:35 +08:00
parent dfd3fb5d7f fe0ba3d7bd
commit 549eb788b4
28 changed files with 544 additions and 733 deletions
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -9,7 +9,7 @@
    </el-card>

    <el-card>
-      <el-table v-loading="listLoading" :data="tableData" border size="mini" style="width: 100%" height="650px">
+      <el-table v-loading="listLoading" :data="tableDataNum" border size="mini" style="width: 100%" height="650px">
        <el-table-column
          label="序号"
          align="center"
@@ -32,12 +32,12 @@
        </el-table-column>
        <el-table-column label="计划数量" align="center" min-width="100">
          <template slot-scope="scope" align="center">
-            {{ tableData[scope.$index].plannumber }}
+            {{ tableDataNum[scope.$index].plannumber }}
          </template>
        </el-table-column>
        <el-table-column label="入库数量" align="center" min-width="100">
          <template slot-scope="scope">
-            <el-input v-model="tableData[scope.$index].innumber" clearable size="mini"/>
+            <el-input v-model="tableDataNum[scope.$index].innumber" clearable size="mini"/>
          </template>
        </el-table-column>
        <el-table-column label="仓库" align="center" min-width="100">
@@ -92,7 +92,7 @@ export default {
      ace: 0,
      a: '',
      tableData: [],
-      partNumber: '',
+      partNumber: [],
      listLoading: false,
      craftplannumber: '',
      radio2: 3,
@@ -101,7 +101,8 @@ export default {
      inventoryNumber: '',
      locateName: [], // 货位名称下拉框
      locateNumber: '',
-      Partpaint: ''
+      Partpaint: '',
+      tableDataNum: []
    }
  },
  computed: {
@@ -118,6 +119,7 @@ export default {
  methods: {
    // 移除
    handleDelete(index, row) {
+      this.tableDataNum.splice(index, 1)
      this.tableData.splice(index, 1)
    },
    // 获取人员编号
@@ -153,10 +155,12 @@ export default {
    },
    // 根据图号查流水号并查表1
    getCraftNumber() {
-      this.partNumber = ''
+      this.partNumber = []
      CraftNumber(this.Partpaint).then(response => {
-        if (response.data.length > 0 && response.data[0].工艺计划流水号) {
-          this.partNumber = response.data[0].工艺计划流水号
+        for (let i = 0; i < response.data.length; i++) {
+          this.partNumber.push(
+            response.data[i].工艺计划流水号
+          )
        }
      }).then(() => {
        this.getscantable()
@@ -166,50 +170,78 @@ export default {
    getPaint() {
      searchPartNumber(this.partNumber).then(response => {
        this.Partpaint = response.data[0].零件图号
+        return this.Partpaint
+      }).then(() => {
+        this.getCraftNumber()
      })
-      this.getscantable()
+      // this.getscantable()
    },
    // 根据流水号查询
    getscantable() {
-      if (this.partNumber === '' || this.partNumber === null) {
-        this.$message.error('请输入正确零件号')
+      // this.tableData = []
+      if (this.partNumber.length === 0) {
+        this.$notify({
+          title: '警告',
+          message: '请输入正确的零件图号',
+          type: 'warning'
+        })
      } else {
        this.listLoading = true
        searchTable(this.partNumber).then(response => {
-          console.log(response.data)
          if (response.data.length === 0) {
            this.listLoading = false
-            this.$message.warning('该零件未加工完成')
-          } else if (response.data[0].考核状态 === 8) {
-            this.listLoading = false
-            this.$message.warning('该零件已入库')
-          } else if (response.data[0].考核状态 === 9) {
-            this.listLoading = false
-            this.$message.warning('该零件已出库')
-          } else if (response.data[0].考核状态 === 7) {
-            for (let i = 0; i < this.tableData.length; i++) {
-              if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
-                this.ace = this.ace + 1
+            this.$notify({
+              title: '警告',
+              message: '该零件未加工完成',
+              type: 'warning'
+            })
+          } else {
+            for (let i = 0; i < response.data.length; i++) {
+              if (response.data[i].考核状态 === 8) {
+                this.listLoading = false
+                this.$notify({
+                  title: '警告',
+                  message: 'P' + response.data[i].工艺计划流水号 + '已入库',
+                  type: 'warning'
+                })
+              } else if (response.data[i].考核状态 === 9) {
+                this.listLoading = false
+                this.$notify({
+                  title: '警告',
+                  message: 'P' + response.data[i].工艺计划流水号 + '已出库',
+                  type: 'warning'
+                })
+              } else if (response.data[i].考核状态 === 7) {
+                this.listLoading = false
+                this.tableData.push({
+                  plannumber: response.data[i].剩余数量,
+                  innumber: response.data[i].入库数量,
+                  capture: '',
+                  note: '',
+                  工艺计划流水号: response.data[i].工艺计划流水号,
+                  项目名称: response.data[i].项目名称,
+                  机床图号: response.data[i].机床图号,
+                  零件图号: response.data[i].零件图号
+                })
+                const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件
+                this.tableDataNum = this.tableData.reduce((preVal, curVal) => {
+                  hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({
+                    工艺计划流水号: curVal.工艺计划流水号,
+                    项目名称: curVal.项目名称,
+                    机床图号: curVal.机床图号,
+                    零件图号: curVal.零件图号,
+                    plannumber: curVal.plannumber,
+                    innumber: curVal.innumber,
+                    capture: '',
+                    note: ''
+                  })
+                  return preVal
+                }, [])
              }
            }
-            if (this.ace === 0) {
-              this.tableData.push({
-                plannumber: response.data[0].剩余数量,
-                innumber: response.data[0].入库数量,
-                capture: '',
-                note: '',
-                工艺计划流水号: response.data[0].工艺计划流水号,
-                项目名称: response.data[0].项目名称,
-                机床图号: response.data[0].机床图号,
-                零件图号: response.data[0].零件图号
-              })
-            } else {
-              this.$message.error('此件已在列表中')
-            }
          }
        }).then(() => {
          this.listLoading = false
-          this.ace = 0
        })
      }
    },
@@ -223,14 +255,14 @@ export default {
        if (this.locateNumber === '') {
          this.$message.error('请选择货位')
        } else {
-          for (let i = 0; i < this.tableData.length; i++) {
-            if (Number(this.tableData[i].innumber) === 0) {
+          for (let i = 0; i < this.tableDataNum.length; i++) {
+            if (Number(this.tableDataNum[i].innumber) === 0) {
              this.$message.error('请输入正确数量')
            } else {
-              if (this.tableData[i].innumber > this.tableData[i].plannumber) {
-                this.tableData[i].innumber = this.tableData[i].plannumber
+              if (this.tableDataNum[i].innumber > this.tableDataNum[i].plannumber) {
+                this.tableDataNum[i].innumber = this.tableDataNum[i].plannumber
              }
-              insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
+              insertOne(this.tableDataNum[i].工艺计划流水号, this.tableDataNum[i].innumber, this.PeopleNumber, this.tableDataNum[i].capture, this.inventoryNumber, this.locateNumber, this.tableDataNum[i].note).then(response => {
                if (response.data[0].result === '1') {
                  this.$message({
                    type: 'success',
@@ -257,6 +289,7 @@ export default {
    // 清空
    Empty() {
      this.tableData = []
+      this.tableDataNum = []
      this.Partpaint = ''
    },
    // 仓库查询
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -226,7 +226,8 @@ export default {
      total2: 0,
      materialName: '', // 物料名称
      materialSpec: '', // 物料规格
-      materialModel: '' // 物料型号
+      materialModel: '', // 物料型号
+      离线合同明细流水号: ''
    }
  },
  computed: {
@@ -270,7 +271,7 @@ export default {
        for (let i = 0; i < response.data.length; i++) {
          this.GroupNum.push({
            label: response.data[i].组号,
-            value: response.data[i].组件流水号
+            value: Number(response.data[i].组件流水号)
          })
        }
      })
@@ -333,13 +334,13 @@ export default {
      if (this.$refs['form'] !== undefined) {
        this.$refs['form'].resetFields()
      }
-      this.form = {}
      this.form.MachineValue = ''
      this.form.GroupNumValue = ''
      this.dialogFormVisible = true
      this.locateNumber = row.货位流水号
      this.materialNumber = row.物料流水号
      this.partnumber = row.货位存量
+      this.离线合同明细流水号 = row.离线合同明细流水号
    },
    // 重置表单
    callOff() {
@@ -360,13 +361,12 @@ export default {
    },
    // 离线外购件出库
    addDirectPartm() {
-      console.log(this.partnumber, this.form.DirectNumber)
      if (Number(this.partnumber) < Number(this.form.DirectNumber)) {
        this.$message.error('请正确输入数量')
      } else {
        this.$refs['form'].validate((valid) => {
          if (valid) {
-            outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber).then(response => {
+            outlinePartOut(this.form.PeopleValue, this.form.DirectNumber, this.locateNumber, this.form.DirectNote, this.form.ProjectValue, this.form.MachineValue, this.form.GroupNumValue, this.materialNumber, this.PeopleNumber, this.离线合同明细流水号).then(response => {
              if (response.data[0].result === '1') {
                this.$message.success('零件出库成功')
                this.dialogFormVisible = false
--- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
@@ -0,0 +1,153 @@
+<template>
+  <div>
+    <el-card>
+      <el-badge :value="value" class="item" style="margin-bottom: 10px; float: right">
+        <el-button size="small" @click="openWindow">Andon信息</el-button>
+      </el-badge>
+      <el-table
+        :data="tableData"
+        style="width: 100%;"
+        size="mini"
+        height="800"
+        highlight-current-row
+        border>
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            <el-button type="text">{{ scope.row.工位号 }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="登陆人">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
+            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="呼叫类型">
+          <template slot-scope="scope">
+            <div v-if="scope.row.呼叫备注===''|| scope.row.呼叫备注===null"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>正常工作</div>
+            <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>{{ scope.row.呼叫备注 }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="60%">
+      <el-table
+        :data="tableDataMassage"
+        style="width: 100%;"
+        size="mini"
+        height="500"
+        highlight-current-row
+        border>
+        <el-table-column align="center" label="工位号">
+          <template slot-scope="scope">
+            <el-button type="text">{{ scope.row.工位号 }}</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="登陆人">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
+            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="呼叫类型">
+          <template slot-scope="scope">
+            <div v-if="scope.row.呼叫备注===''|| scope.row.呼叫备注===null"><div style="width: 12px;height: 12px;border-radius: 50%;background-color: rgb(103, 194, 58);display: inline-block;margin:0px 5px 0 0"/>正常工作</div>
+            <div v-else ><div style="width: 12px;height: 12px;border-radius: 50%;background-color: red;display: inline-block;margin:0px 5px 0 0"/>{{ scope.row.呼叫备注 }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { ANDON_countselect } from '@/api/ManufacturingCenter/AntonMonitoring'
+import { wsuri, name1 } from '@/utils/request'
+export default {
+  data() {
+    return {
+      tableData: [],
+      timer_ANDON: '',
+      andonMsg: '',
+      Name: '',
+      massage: [],
+      dialogVisible: false,
+      tableDataMassage: [],
+      value: 0
+    }
+  },
+  mounted() {
+    this.ANDON_countselect()
+    this.timer_ANDON = setInterval(this.search(), 60 * 1000 * 5) // ANDON看板 5 分钟一刷新
+  },
+  created() {
+    this.initWebpack()
+  },
+  methods: {
+    ANDON_countselect() {
+      ANDON_countselect().then(response => {
+        this.tableData = response.data
+      })
+    },
+    // 初始化websocket
+    initWebpack() {
+      this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
+      this.websock.onopen = this.websocketopen
+      this.websock.onmessage = this.websocketonmessage
+      this.websock.onclose = this.websocketclose
+      this.websock.onerror = this.websocketerror
+    },
+    // 打开
+    websocketopen() {
+      console.log('WebSocket连接成功')
+      this.websock.send('{<' + name1 + '>}')
+    },
+    // 数据接收
+    websocketonmessage(msg) {
+      console.log(msg)
+      this.andonMsg = msg.data.split('|')[3]
+      this.Name = msg.data.split('|')[2]
+      if (this.andonMsg === '1') {
+        this.search()
+      }
+    },
+    // 关闭
+    websocketclose() {
+      console.log('WebSocket关闭')
+    },
+    // 失败
+    websocketerror() {
+      console.log('WebSocket连接失败')
+    },
+    search() {
+      this.tableDataMassage = []
+      ANDON_countselect().then(response => {
+        this.tableData = response.data
+        return response.data
+      }).then(data => {
+        for (let i = 0; i < data.length; i++) {
+          if (data[i].呼叫备注 !== null) {
+            this.tableDataMassage.push(data[i])
+          }
+        }
+        this.value = this.tableDataMassage.length
+      })
+    },
+    openWindow() {
+      this.dialogVisible = true
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-left: 2px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+    margin-right: 2px;
+  }
+</style>
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -1,19 +1,55 @@
 <template>
  <div class="app-container">
    <el-card>
-      <span>零件号：</span>
-      <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
-      <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
-      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoaddek('dek')">导出工艺定额卡</el-button>
-      <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-download" @click="downLoadlxd('lxd')">导出加工路线单</el-button>
-
-    </el-card>
-    <el-card>
+      <div slot="header">
+        <el-row>
+          <el-col style="width: 280px">
+            <span>机床号：</span>
+            <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
+              <el-option
+                v-for="item in machineNumber"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+                <div style="float: left">{{ item.label }}</div>
+                <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+              </el-option>
+            </el-select>
+          </el-col>
+          <el-col style="width: 270px">
+            <span>组号：</span>
+            <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
+              <el-option
+                v-for="item in groupNumber"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width: 280px">
+            <span>零件号：</span>
+            <el-input v-model="PrNum" size="small" placeholder="零件号" clearable style="width: 200px"/>
+          </el-col>
+          <el-col style="width: 290px">
+            <span>工艺员：</span>
+            <el-select v-model="personValue" placeholder="工艺员" size="small" clearable>
+              <el-option
+                v-for="item in person"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </el-col>
+          <el-col style="width: 290px">
+            <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=10;total=0;searchData()">查询</el-button>
+          </el-col>
+        </el-row>
+      </div>
      <el-table
        v-loading="loading"
        :data="tableData"
-        style="max-height: 300px"
-        height="300px"
+        style="max-height: 550px"
+        height="550"
        border
        highlight-current-row
        @row-click="click">
@@ -44,545 +80,88 @@
          @current-change="handleCurrentChange"/>
      </div>
    </el-card>
-    <el-card>
-      <table id="dek" style="width: 975px;" border="2px" cellspacing="0px" align="center">
-        <thead>
-          <tr height="25px">
-            <td colspan="4" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
-            <td rowspan="4" style="font-size: 30px;font-weight: bold;width: 210px">工艺、定额卡</td>
-            <td>零件图号</td>
-            <td colspan="3">{{ 零件图号 }}</td>
-          </tr>
-          <tr>
-            <td>零件名称</td>
-            <td>{{ 零件名称 }}</td>
-            <td>数量</td>
-            <td>{{ 投产数量 }}</td>
-          </tr>
-          <tr>
-            <td colspan="4" style="text-align:center;">江苏高精机电装备有限公司</td>
-            <td colspan="2">材料</td>
-            <td colspan="2">原材料规格</td>
-          </tr>
-          <tr>
-            <td>机床号</td>
-            <td>{{ 机床号 }}</td>
-            <td>组号</td>
-            <td>{{ 组号 }}</td>
-            <td colspan="2">{{ 材料 }}</td>
-            <td colspan="2">{{ 原材料规格 }}</td>
-          </tr>
-          <tr>
-            <td rowspan="2" style="text-align:center;">序次</td>
-            <td rowspan="2" colspan="2" style="text-align:center;">工艺名称</td>
-            <td rowspan="2" colspan="4" style="text-align:center;width: 550px">工艺要求</td>
-            <td colspan="2" style="text-align:center;">定额工时</td>
-          </tr>
-          <tr>
-            <td style="text-align:center;">单件</td>
-            <td style="text-align:center;">准结</td>
-          </tr>
-        </thead>
-        <tbody>
-          <tr id="1">
-            <td>1</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="2">
-            <td>2</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="3">
-            <td>3</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="4">
-            <td>4</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="5">
-            <td>5</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="6">
-            <td>6</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="7">
-            <td>7</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="8">
-            <td>8</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="9">
-            <td>9</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="10">
-            <td>10</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="11">
-            <td>11</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="12">
-            <td>12</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="13">
-            <td>13</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="14">
-            <td>14</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="15">
-            <td>15</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="16">
-            <td>16</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="17">
-            <td>17</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="18">
-            <td>18</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="19">
-            <td>19</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-          <tr id="20">
-            <td>20</td>
-            <td colspan="2"/>
-            <td colspan="4" style="text-align:left;"/>
-            <td/>
-            <td/>
-          </tr>
-        </tbody>
-        <tfoot>
-          <tr>
-            <td>工艺员:</td>
-            <td colspan="2">{{ 工艺员 }}</td>
-            <td>定额员:</td>
-            <td>{{ 定额员 }}</td>
-            <td>日期:</td>
-            <td colspan="3">{{ 日期 }}</td>
-          </tr>
-        </tfoot>
-      </table>
-    </el-card>
-    <el-card>
-      <table id="lxd" style="width: 800px;" border="2px" cellspacing="0px" align="center">
-        <thead>
-          <tr height="60px">
-            <td colspan="6" style="text-align:center;width: 33%">江苏高精机电<br>装备有限公司</td>
-            <td colspan="6" style="font-size: 30px;font-weight: bold;text-align:center;width: 34%">零件加工路线单</td>
-            <td colspan="6" style="text-align:center;width: 33%">毛 坯 别 <br> 铸 锻 铆 锯 材</td>
-          </tr>
-          <tr>
-            <td colspan="2" style="text-align:center">材料</td>
-            <td colspan="4" style="text-align:center">{{ 材料 }}</td>
-            <td colspan="3" style="text-align:center;width: 17%">材料规格</td>
-            <td colspan="9" style="text-align:center">{{ 原材料规格 }}</td>
-          </tr>
-          <tr>
-            <td colspan="4" style="text-align:center">机床号</td>
-            <td colspan="4" style="text-align:center">组号</td>
-            <td colspan="6" style="text-align:center">零件图号</td>
-            <td colspan="3" style="text-align:center">零件名称</td>
-            <td style="text-align:center">数量</td>
-          </tr>
-          <tr height="80px">
-            <td colspan="4" style="text-align:center">{{ 机床号 }}</td>
-            <td colspan="4" style="text-align:center">{{ 组号 }}</td>
-            <td colspan="6" style="text-align:center">{{ 零件图号 }}</td>
-            <td colspan="3" style="text-align:center">{{ 零件名称 }}</td>
-            <td style="text-align:center">{{ 投产数量 }}</td>
-          </tr>
-          <tr>
-            <td colspan="4" style="text-align:center">工序</td>
-            <td colspan="2" style="text-align:center">工时定额</td>
-            <td colspan="3" rowspan="3" style="text-align:center">工作者<br>(设备)</td>
-            <td colspan="4" style="text-align:center">检查结果</td>
-            <td colspan="2" rowspan="3" style="text-align:center">检章</td>
-            <td colspan="2" rowspan="3" style="text-align:center">计划完成日期</td>
-            <td rowspan="3" style="text-align:center">月/日</td>
-          </tr>
-          <tr>
-            <td rowspan="2" style="text-align:center">次序</td>
-            <td colspan="3" rowspan="2" style="text-align:center;width: 15%">名称</td>
-            <td rowspan="2" style="text-align:center">单件</td>
-            <td rowspan="2" style="text-align:center">准结</td>
-            <td rowspan="2" style="text-align:center">合格</td>
-            <td rowspan="2" style="text-align:center">回用</td>
-            <td colspan="2" style="text-align:center">废品</td>
-          </tr>
-          <tr>
-            <td style="text-align:center;width: 5%">工</td>
-            <td style="text-align:center;width: 5%">料</td>
-          </tr>
-        </thead>
-        <tbody>
-          <tr id="21">
-            <td style="text-align:center">1</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="22">
-            <td style="text-align:center">2</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="23">
-            <td style="text-align:center">3</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="24">
-            <td style="text-align:center">4</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="25">
-            <td style="text-align:center">5</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="26">
-            <td style="text-align:center">6</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="27">
-            <td style="text-align:center">7</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="28">
-            <td style="text-align:center">8</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="29">
-            <td style="text-align:center">9</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="30">
-            <td style="text-align:center">10</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="31">
-            <td style="text-align:center">11</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="32">
-            <td style="text-align:center">12</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="33">
-            <td style="text-align:center">13</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="34">
-            <td style="text-align:center">14</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="35">
-            <td style="text-align:center">15</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="36">
-            <td style="text-align:center">16</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="37">
-            <td style="text-align:center">17</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="38">
-            <td style="text-align:center">18</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="39">
-            <td style="text-align:center">19</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-          <tr id="40">
-            <td style="text-align:center">20</td>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="3" style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td colspan="2" style="text-align:center"/>
-            <td style="text-align:center"/>
-          </tr>
-        </tbody>
+    <el-card v-if="tableData2.length">
+      <table class="tg">
+        <tr>
+          <td class="tg-x61c" colspan="4" rowspan="2">江苏高精</td>
+          <td class="tg-c3ow" colspan="2" rowspan="2">零件条码</td>
+          <td class="tg-c3ow" colspan="3">零件图号</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件图号 : '' }}</td>
+          <td class="tg-c3ow">数量</td>
+        </tr>
+        <tr>
+          <td class="tg-c3ow" colspan="3">零件名称</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].零件名称 : '' }}</td>
+          <td class="tg-c3ow" rowspan="3">{{ tableData2[0] ? tableData2[0].投产数量 : '' }}</td>
+        </tr>
+        <tr>
+          <td class="tg-c3ow" colspan="2">项目名称</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].项目名称 : '' }}</td>
+          <td class="tg-c3ow" colspan="2" rowspan="2">{{ tableData2[0] ? 'P' + tableData2[0].工艺计划流水号 : '' }}</td>
+          <td class="tg-c3ow" colspan="3">机床</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机床图号 : '' }}</td>
+        </tr>
+        <tr>
+          <td class="tg-c3ow">材质</td>
+          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].材料 : '' }}</td>
+          <td class="tg-c3ow">规格</td>
+          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].原材料规格 : '' }}</td>
+          <td class="tg-c3ow" colspan="3">组号</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].组号 : '' }}</td>
+        </tr>
+        <tr>
+          <td class="tg-c3ow">序次</td>
+          <td class="tg-c3ow">工艺名称</td>
+          <td class="tg-c3ow" colspan="3">工艺要求</td>
+          <td class="tg-c3ow">难度系数</td>
+          <td class="tg-c3ow">工作者</td>
+          <td class="tg-c3ow">单件</td>
+          <td class="tg-c3ow">准结</td>
+          <td class="tg-c3ow">检查结果</td>
+          <td class="tg-c3ow">计划完成日期</td>
+          <td class="tg-c3ow">工序条码</td>
+        </tr>
+        <tr v-for="(value,key) in tableData2" :id="key" :key="key">
+          <td class="tg-c3ow">{{ key + 1 }}</td>
+          <td class="tg-c3ow">{{ value.工艺名称 }}</td>
+          <td class="tg-c3ow" colspan="3">{{ value.工艺要求 }}</td>
+          <td class="tg-c3ow">{{ value.工艺难度等级 }}</td>
+          <td class="tg-c3ow"/>
+          <td class="tg-c3ow">{{ value.单件定额工时 }}</td>
+          <td class="tg-c3ow">{{ value.准结定额工时 }}</td>
+          <td class="tg-c3ow"/>
+          <td class="tg-c3ow">{{ value.计划日期 }}</td>
+          <td class="tg-c3ow">{{ value.工序流水号 }}</td>
+        </tr>
+        <tr>
+          <td class="tg-c3ow">工艺员</td>
+          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺员 : '' }}</td>
+          <td class="tg-c3ow">定额员</td>
+          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].定额员 : '' }}</td>
+          <td class="tg-c3ow">工艺完成</td>
+          <td class="tg-c3ow">{{ tableData2[0] ? tableData2[0].工艺实际完成时间.split(' ')[0] : '' }}</td>
+          <td class="tg-c3ow">加工开始</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工开始时间 : '' }}</td>
+          <td class="tg-c3ow">加工结束</td>
+          <td class="tg-c3ow" colspan="2">{{ tableData2[0] ? tableData2[0].机加工结束时间 : '' }}</td>
+        </tr>
      </table>
    </el-card>
  </div>
 </template>

 <script>
-import { search, searchtable1, searchtable2 } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'
-import { getExplorer, method5, Cleanup } from '@/vendor/exportExcel'
+import { initMachineProject, searchgroup, initPerson, search, searchtable1 } from '@/api/ManufacturingCenter/PartWorkCraftSelect_rdlc'

 export default {
  data() {
    return {
-      cell: [],
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      personValue: '',
+      person: [],
      pageCurrent: 1,
      pageSize: 10,
      total: 0,
@@ -609,16 +188,46 @@ export default {
  },
  methods: {
    fetchData() {
-      for (let i = 0; i < 9; i++) {
-        for (let j = 1; j < 28; j++) {
-          this.cell.push(String.fromCharCode(65 + i) + j)
+      initMachineProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
        }
-      }
+      })
+      initPerson().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
    },
    searchData() {
      this.loading = true
-      search(this.pageCurrent, this.pageSize, this.PrNum).then(response => {
+      let check1, check2, check3, check4
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      this.PrNum ? check3 = 1 : check3 = 0
+      this.personValue ? check4 = 1 : check4 = 0
+      search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue).then(response => {
        this.tableData = response.data.rows
+        console.log(response)
        this.total = response.data.total
        this.loading = false
      })
@@ -626,46 +235,6 @@ export default {
    click(row) {
      searchtable1(row.工艺计划流水号).then(response => {
        this.tableData2 = response.data
-        this.tableData2[0].工艺实际完成时间 = response.data[0].工艺实际完成时间.substr(0, 10) // 只处理了要显示的时间格式
-        this.机床号 = response.data[0].机床图号
-        this.组号 = response.data[0].组号
-        this.零件图号 = response.data[0].零件图号
-        this.零件名称 = response.data[0].零件名称
-        this.投产数量 = response.data[0].投产数量
-        this.材料 = response.data[0].材料
-        this.原材料规格 = response.data[0].原材料规格
-        this.工艺员 = response.data[0].工艺员
-        this.定额员 = response.data[0].定额员
-        this.日期 = response.data[0].工艺实际完成时间.substr(0, 10)
-      }).then(() => {
-        for (let j = 0; j < 20; j++) {
-          document.getElementById(String(j + 1)).children[1].innerHTML = ''
-          document.getElementById(String(j + 1)).children[2].innerHTML = ''
-          document.getElementById(String(j + 1)).children[3].innerHTML = ''
-          document.getElementById(String(j + 1)).children[4].innerHTML = ''
-        }
-        for (let j = 0; j < this.tableData2.length; j++) {
-          document.getElementById(String(j + 1)).children[1].innerHTML = this.tableData2[j].工艺名称
-          document.getElementById(String(j + 1)).children[2].innerHTML = this.tableData2[j].工艺要求
-          document.getElementById(String(j + 1)).children[3].innerHTML = this.tableData2[j].单件定额工时
-          document.getElementById(String(j + 1)).children[4].innerHTML = this.tableData2[j].准结定额工时
-        }
-      })
-      searchtable2(row.工艺计划流水号).then(response => {
-        this.tableData3 = response.data
-      }).then(() => {
-        for (let j = 0; j < 20; j++) {
-          document.getElementById(String(j + 21)).children[1].innerHTML = ''
-          document.getElementById(String(j + 21)).children[2].innerHTML = ''
-          document.getElementById(String(j + 21)).children[3].innerHTML = ''
-          document.getElementById(String(j + 21)).children[10].innerHTML = ''
-        }
-        for (let j = 0; j < this.tableData3.length; j++) {
-          document.getElementById(String(j + 21)).children[1].innerHTML = this.tableData3[j].工艺名称
-          document.getElementById(String(j + 21)).children[2].innerHTML = this.tableData3[j].单件定额工时
-          document.getElementById(String(j + 21)).children[3].innerHTML = this.tableData3[j].准结定额工时
-          document.getElementById(String(j + 21)).children[10].innerHTML = this.tableData3[j].计划日期.substr(5, 5)
-        }
      })
    },
    handleSizeChange(val) {
@@ -676,27 +245,6 @@ export default {
    handleCurrentChange(val) {
      this.pageCurrent = val
      this.searchData()
-    },
-    handleDownload() {
-      if (this.tableData2.length === 0) {
-        this.$message.error('请选择一个零件')
-      } else {
-        require.ensure([], () => {
-          const { export_json_to_excel } = require('@/vendor/Export2Excel1')
-          const list = this.tableData2
-          export_json_to_excel(list, '工艺定额卡', this.cell)
-        })
-      }
-    },
-    downLoaddek(tableid) { // 下载工艺定额卡
-      getExplorer()
-      method5(tableid)
-      Cleanup()
-    },
-    downLoadlxd(tableid) { // 下载零件加工路线单
-      getExplorer()
-      method5(tableid)
-      Cleanup()
    }
  }
 }
@@ -707,6 +255,11 @@ export default {
    height: 30px;
    text-align:center;
  }
+  .tg  {border-collapse:collapse;border-spacing:0;margin: 0 auto}
+  .tg td{font-family:Arial, sans-serif;font-size:14px;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg th{font-family:Arial, sans-serif;font-size:14px;font-weight:normal;padding:10px 5px;border-style:solid;border-width:1px;overflow:hidden;word-break:normal;border-color:black;}
+  .tg .tg-c3ow{border-color:inherit;text-align:center;vertical-align:top}
+  .tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
 </style>
 <style scoped>
  span{
@@ -715,8 +268,7 @@ export default {
  .el-card{
    margin-bottom: 15px;
  }
-  .el-table {
-    max-height: 250px;
-    overflow: auto;
-  }
+    .el-col{
+        margin-bottom: 10px;
+    }
 </style>
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -15,7 +15,7 @@
          :value="item.value"/>
      </el-select>
      <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
+      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchDetail()">
        <el-option
          v-for="item in partNum"
          :key="item.value"
@@ -175,6 +175,7 @@
      <el-table
        v-loading="loading0"
        :data="tableData"
+        class="processTable"
        border
        style="width: 100%;max-height: 550px;"
        size="mini"
@@ -185,7 +186,6 @@
            <el-input
              v-model="scope.row.工艺名称"
              :disabled="disabled"
-              size="mini"
              readonly
              style="width:200px"
              @dblclick.native="tableSearch(scope.$index)"/>
@@ -196,7 +196,6 @@
            <el-select
              v-model="scope.row.工艺难度等级"
              :disabled="disabled"
-              size="mini"
              @change="hardEdit(scope.row)">
              <el-option v-for="item in hard" :key="item.value" :label="item.label" :value="item.value">
                <span style="color: #8492a6; font-size: 13px">{{ item.value }}</span>
@@ -210,7 +209,6 @@
              v-model="scope.row.工艺要求"
              :rows="1"
              :disabled="disabled"
-              size="mini"
              type="textarea"
              @dblclick.native="tableSearch(scope.$index)"
              @change="requestEdit(scope.row)"/>
@@ -221,25 +219,21 @@
            <div>
              <el-button
                :disabled="disabled"
-                size="mini"
                icon="el-icon-arrow-up"
                type="primary"
                @click="upOne(scope.row)"/>
              <el-button
                :disabled="disabled"
-                size="mini"
                icon="el-icon-arrow-down"
                type="primary"
                @click="downOne(scope.row)"/>
              <el-button
                :disabled="disabled"
-                size="mini"
                icon="el-icon-circle-plus-outline"
                type="primary"
                @click="insertOne(scope.row)"/>
              <el-button
                :disabled="disabled"
-                size="mini"
                icon="el-icon-delete"
                type="danger"
                @click="deleteOne(scope.row)"/>
@@ -1451,3 +1445,15 @@ export default {
    background: oldlace;
  }
 </style>
+<style lang="scss">
+    .processTable{
+        .el-input__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+        .el-textarea__inner{
+            font-weight: bold;
+            font-size: 20px;
+        }
+    }
+</style>
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -411,22 +411,18 @@ export default {
      })
    },
    typeChange() {
-      if (this.projectValue === '' || this.projectValue === null) {
-        this.toolNumValue = ''
-        this.toolNum = []
-      } else {
-        getToolNum(1, this.projectValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.toolNum.push({
-              label: response.data[i].机床图号,
-              value: response.data[i].机床流水号
-            })
-          }
-        })
-      }
+      this.toolNumValue = ''
+      this.toolNum = []
+      getToolNum(1, this.projectValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.toolNum.push({
+            label: response.data[i].机床图号,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
    },
    groupChange(row, index) {
-      console.log(row.组件流水号)
      if (row.组件流水号 !== '') {
        searchgroupName(row.组件流水号).then(response => {
          console.log(response.data)
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -81,12 +81,12 @@
            </el-table-column>
            <el-table-column label="开始时间" align="center" min-width="130px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 }}</span>
+                <span :class="colorJudge(scope.row.合同签订日期)">{{ scope.row.合同签订日期 === '1900-01-01 00:00:00' ? '' : scope.row.合同签订日期 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="结束时间" align="center" min-width="130px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 }}</span>
+                <span :class="colorJudge(scope.row.发货节点)">{{ scope.row.发货节点 === '1900-01-01 00:00:00' ? '' : scope.row.发货节点 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="设备预验节点" align="center" width="150px">
@@ -101,67 +101,67 @@
            </el-table-column>
            <el-table-column label="审图（计划开始）" align="center" min-width="170px">
              <template slot-scope="scope">
-                {{ scope.row.审图计划开始时间 }}
+                {{ scope.row.审图计划开始时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划开始时间 }}
              </template>
            </el-table-column>
            <el-table-column label="审图（计划完成）" align="center" min-width="170px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 }}</span>
+                <span :class="colorJudge(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图计划完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图计划完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="审图（实际完成）" align="center" min-width="170px">
              <template slot-scope="scope">
-                <span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 }}</span>
+                <span :class="colorActual(scope.row.审图计划完成时间, scope.row.审图实际完成时间)">{{ scope.row.审图实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.审图实际完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="发图" align="center" min-width="140px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间 }}</span>
+                <span :class="colorJudge(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床设计完成时间 ? scope.row.机床设计完成时间.split(' ')[0] : '') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="发图（实际）" align="center" width="140px">
              <template slot-scope="scope">
-                <span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 }}</span>
+                <span :class="colorActual(scope.row.机床设计完成时间, scope.row.机床设计实际完成时间)">{{ scope.row.机床设计实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床设计实际完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="采购" align="center" min-width="140px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间 }}</span>
+                <span :class="colorJudge(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.采购完成时间 ? scope.row.采购完成时间.split(' ')[0] : '') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="采购（实际）" align="center" width="140px">
              <template slot-scope="scope">
-                <span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 }}</span>
+                <span :class="colorActual(scope.row.采购完成时间, scope.row.采购实际完成时间)">{{ scope.row.采购实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.采购实际完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="备料" align="center" min-width="140px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间 }}</span>
+                <span :class="colorJudge(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.备料完成时间 ? scope.row.备料完成时间.split(' ')[0] : '') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="备料（实际）" align="center" width="140px">
              <template slot-scope="scope">
-                <span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 }}</span>
+                <span :class="colorActual(scope.row.备料完成时间, scope.row.备料实际完成时间)">{{ scope.row.备料实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.备料实际完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="制造" align="center" min-width="140px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间 }}</span>
+                <span :class="colorJudge(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床生产完成时间 ? scope.row.机床生产完成时间.split(' ')[0] : '') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="制造（实际）" align="center" width="140px">
              <template slot-scope="scope">
-                <span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 }}</span>
+                <span :class=" colorActual(scope.row.机床生产完成时间, scope.row.机床生产实际完成时间)">{{ scope.row.机床生产实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床生产实际完成时间 }}</span>
              </template>
            </el-table-column>
            <el-table-column label="装配" align="center" min-width="140px">
              <template slot-scope="scope">
-                <span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间 }}</span>
+                <span :class="colorJudge(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配完成时间 === '1900-01-01 00:00:00' ? '' : (scope.row.机床装配完成时间 ? scope.row.机床装配完成时间.split(' ')[0] : '') }}</span>
              </template>
            </el-table-column>
            <el-table-column label="装配（实际）" align="center" width="140px">
              <template slot-scope="scope">
-                <span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 }}</span>
+                <span :class="colorActual(scope.row.机床装配完成时间, scope.row.机床装配实际完成时间)">{{ scope.row.机床装配实际完成时间 === '1900-01-01 00:00:00' ? '' : scope.row.机床装配实际完成时间 }}</span>
              </template>
            </el-table-column>
          </el-table>
--- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue
+++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue
@@ -212,8 +212,8 @@ export default {
        this.partName = ''
        this.batchNum = ''
        this.material = ''
-        this.personValue = ''
        this.tableData = [] // 清主表
+        this.personChange()
      } else { // 未编制
        this.shuliang = ''
        this.isShow = false
@@ -224,7 +224,6 @@ export default {
        this.partName = ''
        this.batchNum = ''
        this.material = ''
-        this.personValue = ''
        this.tableData = [] // 清主表
        getPartnames1().then(response => {
          for (let i = 0; i < response.data.length; i++) {
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -187,19 +187,19 @@
                  {{ scope.row.付款方式 }}
                </template>
              </el-table-column>
-              <el-table-column align="center" label="合同总金额（元）" width="150">
+              <el-table-column align="center" label="合同总金额（万元）" width="150">
                <template slot-scope="scope">
-                  {{ scope.row.合同总金额 }}
+                  {{ scope.row.合同总金额.toFixed(2) }}
                </template>
              </el-table-column>
-              <el-table-column align="center" label="已到账金额（元）" width="150">
+              <el-table-column align="center" label="已到账金额（万元）" width="150">
                <template slot-scope="scope">
-                  {{ scope.row.已支付 }}
+                  {{ scope.row.已支付.toFixed(2) }}
                </template>
              </el-table-column>
-              <el-table-column align="center" label="未到账金额（元）" width="150">
+              <el-table-column align="center" label="未到账金额（万元）" width="150">
                <template slot-scope="scope">
-                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
+                  <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额.toFixed(2) }}</el-tag>
                </template>
              </el-table-column>
              <el-table-column align="center" label="付款进度" width="150">
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -104,6 +104,11 @@
            </template>
          </template>
        </el-table-column>
+        <el-table-column align="center" label="客户名称" width="260">
+          <template slot-scope="scope">
+            {{ scope.row.客户名称 }}
+          </template>
+        </el-table-column>
        <el-table-column align="center" label="项目名称" width="200">
          <template slot-scope="scope">
            {{ scope.row.项目名称 }}
@@ -144,11 +149,6 @@
            {{ scope.row.营销经理 }}
          </template>
        </el-table-column>
-        <el-table-column align="center" label="客户名称" width="260">
-          <template slot-scope="scope">
-            {{ scope.row.客户名称 }}
-          </template>
-        </el-table-column>
        <el-table-column align="center" label="联系人" width="80">
          <template slot-scope="scope">
            {{ scope.row.联系人 }}
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -484,10 +484,10 @@ export default {
          sums[index] = this.taxRate * 100 + '% (税率)'
          return
        } else if (index === 9) {
-          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 元(税额)'
+          sums[index] = (parseInt(sums[7]) * 100 * this.taxRate) / 100 + ' 万元(税额)'
          return
        } else if (index === 10) {
-          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 元(未税)'
+          sums[index] = parseFloat(sums[7]) - parseFloat(sums[9]) + ' 万元(未税)'
          return
        }
      })
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -574,11 +574,6 @@
              {{ scope.row.企业性质 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="创立日期" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
          <el-table-column align="center" label="注册资本" min-width="100">
            <template slot-scope="scope">
              {{ scope.row.注册资本 }}
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -484,11 +484,6 @@
              {{ scope.row.企业性质 }}
            </template>
          </el-table-column>
-          <el-table-column align="center" label="创立日期" min-width="100">
-            <template slot-scope="scope">
-              {{ scope.row.创立日期 }}
-            </template>
-          </el-table-column>
          <el-table-column align="center" label="注册资本" min-width="100">
            <template slot-scope="scope">
              {{ scope.row.注册资本 }}
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -17,7 +17,10 @@
              v-for="item in machine"
              :key="item.value"
              :label="item.label"
-              :value="item.value"/>
+              :value="item.value">
+              <b style="float: left">{{ item.label }}</b>
+              <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
+            </el-option>
          </el-select>
          <el-button
            type="success"
@@ -208,7 +211,10 @@
              v-for="item in machine"
              :key="item.value"
              :label="item.label"
-              :value="item.value"/>
+              :value="item.value">
+              <b style="float: left">{{ item.label }}</b>
+              <b style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</b>
+            </el-option>
          </el-select>
          <el-button
            type="success"
@@ -473,7 +479,8 @@ export default {
        for (let i = 0; i < response.data.length; i++) {
          this.machine.push({
            value: response.data[i].机床流水号,
-            label: response.data[i].机床图号
+            label: response.data[i].机床图号,
+            name: response.data[i].机床名称
          })
        }
      })
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -683,7 +683,7 @@ export default {

 <style>
  .el-table .warning-row {
-    background: oldlace;
+    background: red;
  }
 </style>

--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -640,7 +640,11 @@ export default {

 <style>
  .el-table .warning-row {
+<<<<<<< HEAD
    background: yellowgreen;
+=======
+    background: red;
+>>>>>>> fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d
  }
  .rgb196{
    background: palevioletred;
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -116,10 +116,10 @@
        <el-table-column label="操作" fixed="right" align="center" width="100">
          <template slot-scope="scope">
            <el-button
+              :disabled="Number(id)!==0"
              size="mini"
              type="danger"
              icon="el-icon-delete"
-              disabled
              @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
@@ -202,10 +202,10 @@
        <el-table-column label="操作" fixed="right" align="center" width="200">
          <template slot-scope="scope">
            <el-button
+              :disabled="Number(id)!==0"
              size="mini"
              type="danger"
              icon="el-icon-delete"
-              disabled
              @click="handleDelete(scope.row)">删除</el-button>
          </template>
        </el-table-column>
@@ -226,6 +226,7 @@

 <script>
 import { projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData } from '@/api/TechnologyCenter/QueryParts'
+import { mapGetters } from 'vuex'
 export default {
  name: 'Index',
  data() {
@@ -249,6 +250,10 @@ export default {
    }
  },
  computed: {
+    ...mapGetters([
+      'name',
+      'id' // 人员编号
+    ]),
    groupName() {
      for (let i = 0; i < this.group.length; i++) {
        if (this.group[i].value === this.groupValue) {