diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 81d9727f..9fb095b0 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -174,7 +174,7 @@ export function initPerson() {
     data: {
       type: '1',
       name: '人事档案管理_人员_部门与人员_查询数据_根据部门编号',
-      param: '考核部门编号=10=int'
+      param: '考核部门编号=17'
     }
   })
 }
diff --git a/src/api/PurchasingCenter/qrcodeGeneration.js b/src/api/PurchasingCenter/qrcodeGeneration.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index bf114849..3c8d9abe 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -14,7 +14,12 @@
         <el-radio :label="2">已编制</el-radio>
       </el-radio-group>
       <span>工艺员:</span>
-      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();searchParts()">
+      <el-select
+        v-model="CraftmenValue"
+        placeholder="工艺员"
+        size="small"
+        style="width:100px"
+        @change="clearDetail();searchParts()">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -22,16 +27,26 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts">
+      <el-select
+        v-model="partNumValue"
+        filterable
+        clearable
+        placeholder="零件号"
+        size="small"
+        @clear="clearDetail"
+        @change="searchParts">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询</el-button>
-      <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>
+      <el-button type="success" icon="el-icon-search" style="margin: 10px;" size="small" @click="searchDetail">查询
+      </el-button>
+      <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>
       <div v-show="isShow">
         <span>种类:</span>
         <el-input v-model="typeValue" placeholder="种类" size="small" readonly style="width:100px"/>
@@ -66,15 +81,26 @@
         <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-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>
-          <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 :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存</el-button>
+          <el-button :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 :disabled="disabled" type="primary" size="small" icon="el-icon-cjn-09" @click="saveApprove">保存
+          </el-button>
         </el-button-group>
       </el-row>
-      <el-table v-loading="loading0" :data="tableData" :row-class-name="tableRowClassName" border style="width: 100%;max-height: 550px;" size="mini" height="550px">
+      <el-table
+        v-loading="loading0"
+        :data="tableData"
+        border
+        style="width: 100%;max-height: 550px;"
+        size="mini"
+        height="550px">
         <el-table-column prop="num" label="序号" width="50" align="center" type="index"/>
         <el-table-column prop="name" label="工艺名称" width="230" align="center">
           <template slot-scope="scope">
@@ -147,7 +173,13 @@
 
     <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
       <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+      <el-button
+        type="success"
+        size="small"
+        icon="el-icon-search"
+        style="margin: 0 0 10px 10px"
+        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
+      </el-button>
       <el-table
         :data="tableMaterial"
         size="mini"
@@ -217,7 +249,12 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="典型工艺零件分类">
-              <el-select v-model="typicalClassValue" placeholder="分类" size="small" style="width:150px" @change="classChange()">
+              <el-select
+                v-model="typicalClassValue"
+                placeholder="分类"
+                size="small"
+                style="width:150px"
+                @change="classChange()">
                 <el-option
                   v-for="item in typicalClass"
                   :key="item.value"
@@ -228,7 +265,13 @@
           </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-select
+                id="name"
+                v-model="partNameValue1"
+                placeholder="零件名称"
+                size="small"
+                style="width:150px"
+                @change="nameChange()">
                 <el-option
                   v-for="item in partName1"
                   :key="item.value"
@@ -244,7 +287,13 @@
         <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-select
+                id="num"
+                v-model="processNumValue"
+                placeholder="工艺号"
+                style="width:150px"
+                size="small"
+                @change="numChange()">
                 <el-option
                   v-for="item in partName1"
                   :key="item.value"
@@ -262,7 +311,12 @@
             <el-button size="small" @click="processCopy()">工艺拷贝</el-button>
           </el-col>
         </el-row>
-        <el-table :data="tableData2" style="width: 97%;max-height: 300px;margin-top:15px" height="300px" border size="mini">
+        <el-table
+          :data="tableData2"
+          style="width: 97%;max-height: 300px;margin-top:15px"
+          height="300px"
+          border
+          size="mini">
           <el-table-column align="center" label="工艺序号" width="80">
             <template slot-scope="scope">
               {{ scope.row.工艺序号 }}
@@ -292,7 +346,9 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="工艺员">
-              <el-input v-model="CraftmanValue" size="small" readonly style="width: 150px;" @focus="dialogFormVisible3=true"/>
+              <el-input v-model="CraftmanValue" clearable size="small" readonly style="width: 150px;">
+                <el-button slot="append" icon="el-icon-search" @click="dialogFormVisible3=true"/>
+              </el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
@@ -300,9 +356,7 @@
               <el-input v-model="PN" size="small" placeholder="输入零件号" style="width: 150px" @change="inputChange"/>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
-          </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="10">
@@ -328,13 +382,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-button size="small" @click="processCopy1()">工艺拷贝</el-button>
+            <el-button size="small" type="success" icon="el-icon-search" @click="searchProcess1()">查询</el-button>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
             <el-form-item label="零件图号">
-              <el-select v-model="tuhaoValue" placeholder="零件图号" size="small" style="width:150px" @change="numChange1()">
+              <el-select
+                v-model="tuhaoValue"
+                placeholder="零件图号"
+                size="small"
+                style="width:150px"
+                @change="numChange1()">
                 <el-option
                   v-for="item in tuhao"
                   :key="item.value"
@@ -345,11 +404,19 @@
           </el-col>
           <el-col :span="10">
             <el-form-item label="零件名称">
-              <el-input v-model="remark1" size="small" style="width: 150px;"/>
+              <el-input v-model="remark1" size="small" readonly style="width: 150px;"/>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <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.工序顺序 }}
@@ -423,12 +490,46 @@
 
 <script>
 import '@/icon/iconfont.css'
-import { initCraftmen, getPartnames1, getPartnames2, detailInfo, mainTable, getMaterial, searchMaterial, typicalProcess, initTolerance, FcK,
-  searchProcess, searchWYgongyi, gongyiCopy, initPerson, gongyiYQ, hardEdit, requestEdit, processNameClick, processNameSelect,
-  processRequestSelect, searchTolerance, insertOne, deleteOne, upOne, downOne, saveMaterial, saveApprove, selectRequest,
-  pasteTable, deleteTable, returnEdit, searchRecord } from '@/api/ManufacturingCenter/ProcessPlanning'
+import {
+  initCraftmen,
+  getPartnames1,
+  getPartnames2,
+  detailInfo,
+  mainTable,
+  getMaterial,
+  searchMaterial,
+  typicalProcess,
+  initTolerance,
+  FcK,
+  searchProcess,
+  searchWYgongyi,
+  gongyiCopy,
+  initPerson,
+  gongyiYQ,
+  hardEdit,
+  requestEdit,
+  processNameClick,
+  processNameSelect,
+  processRequestSelect,
+  searchTolerance,
+  insertOne,
+  deleteOne,
+  upOne,
+  downOne,
+  saveMaterial,
+  saveApprove,
+  selectRequest,
+  pasteTable,
+  deleteTable,
+  returnEdit,
+  searchRecord
+} from '@/api/ManufacturingCenter/ProcessPlanning'
+import elInput from 'element-ui/packages/input'
 
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       total: 0,
@@ -445,6 +546,7 @@ export default {
       CraftmenValue: '', // 工艺员值
       Craftmen: [], // 工艺员
       CraftmanValue: '', // 完艺表单工艺员值
+      CraftmanValue2: '', // 完艺表单工艺员值中间变量
       Craftman: [], // 完艺表单工艺员
       partName: '', // 零件名称
       batchNum: '', // 投产总数量
@@ -501,7 +603,8 @@ export default {
       date02: '', // 完艺结束时间
       PN: '', // 零件号
       num: '', // 工艺计划流水号
-      perNum: [],
+      perNum: '',
+      perNum2: '',
       tuhao: [],
       tuhaoValue: '',
       check1: 0,
@@ -532,15 +635,15 @@ export default {
       this.spec = ''
       this.batchNum = ''
     },
-    tableRowClassName({ row }) {
-      for (let i = 0; i < this.tableRecord.length; i++) {
-        if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { //  && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null
-          if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) {
-            return 'change'
-          }
-        }
-      }
-    },
+    // tableRowClassName({ row }) {
+    //   for (let i = 0; i < this.tableRecord.length; i++) {
+    //     if (this.tableRecord[i].工序流水号 === row.工序流水号 && this.radio === 2 && this.tableRecord[i].工艺编号 !== null) { //  && this.tableRecord[i].工艺难度等级 !== null && this.tableRecord[i].工艺要求 !== null
+    //       if (this.tableRecord[i].工艺编号 !== row.工艺编号 || this.tableRecord[i].工艺要求 !== row.工艺要求 || this.tableRecord[i].工艺难度等级 !== row.工艺难度等级 || this.tableRecord[i].工序顺序 !== row.工序顺序) {
+    //         return 'change'
+    //       }
+    //     }
+    //   }
+    // },
     returnEdit() { // 在制零件工艺修改
       if (this.partNumValue === '' || this.partNumValue === null) {
         this.$message.error('请选择零件')
@@ -555,7 +658,9 @@ export default {
               this.$message.success('打回成功')
               this.partNumValue = ''
               this.tableData = []
-            } else { this.$message.error('打回失败') }
+            } else {
+              this.$message.error('打回失败')
+            }
           })
         }).catch(() => {
           this.$message({
@@ -677,7 +782,9 @@ export default {
     switchEdit() { // 切换编辑模式
       if (this.radio === 1) {
         this.isShow = !this.isShow
-      } else { this.isShow = true }
+      } else {
+        this.isShow = true
+      }
     },
     searchDetail() { // 查主表和上面显示的信息
       if (this.partNumValue === '' || this.partNumValue === null) {
@@ -726,12 +833,19 @@ export default {
       this.tableData2 = null
     },
     WYbtn() { // 完艺按钮
-      this.tableData2 = null
+      this.tableData4 = []
       this.dialogFormVisible1 = true
     },
     selectPerson(row) { // 选择工艺员
-      this.CraftmanValue = row.姓名
-      this.perNum = row.人员编号
+      this.CraftmanValue2 = row.姓名
+      this.perNum2 = row.人员编号
+    },
+    tijiao() { // 提交完艺表单中工艺定额人员的选择
+      this.dialogFormVisible3 = false
+      this.CraftmanValue = this.CraftmanValue2
+      this.perNum = this.perNum2
+      this.remark1 = ''
+      this.tuhaoValue = ''
     },
     inputChange() { // 零件号改变
       this.remark1 = ''
@@ -777,15 +891,21 @@ export default {
     searchProcess() { // 典艺工艺查询
       if (this.typicalClassValue === '') {
         this.serialNumValue1check = false
-      } else { this.serialNumValue1check = true }
+      } else {
+        this.serialNumValue1check = true
+      }
 
       if (this.partNameValue1 === '') {
         this.partNameValue1check = false
-      } else { this.partNameValue1check = true }
+      } else {
+        this.partNameValue1check = true
+      }
 
       if (this.processNumValue === '') {
         this.processNumValuecheck = false
-      } else { this.processNumValuecheck = true }
+      } 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
@@ -816,16 +936,24 @@ export default {
       this.tuhao = []
       if (this.PN === '') { // 零件号
         this.check1 = 0
-      } else { this.check1 = 1 }
+      } else {
+        this.check1 = 1
+      }
       if (this.perNum === '') { // 工艺员编号
         this.check2 = 0
-      } else { this.check2 = 1 }
+      } else {
+        this.check2 = 1
+      }
       if (this.remark1 === '') { // 零件名称
         this.check4 = 0
-      } else { this.check4 = 1 }
+      } else {
+        this.check4 = 1
+      }
       if (this.date01 === '' || this.date02 === '' || this.date01 === null || this.date02 === null) { // 日期
         this.check3 = 0
-      } else { this.check3 = 1 }
+      } else {
+        this.check3 = 1
+      }
       searchWYgongyi(this.check1, this.PN, this.check2, this.perNum, this.check3, this.date01, this.date02, this.check4, this.remark1).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.tuhao.push({
@@ -847,11 +975,6 @@ export default {
         })
       }
     },
-    tijiao() { // 提交完艺表单中工艺定额人员的选择
-      this.dialogFormVisible3 = false
-      this.remark1 = ''
-      this.tuhaoValue = ''
-    },
     numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求
       this.remark1 = ''
       this.tableData4 = null
@@ -953,7 +1076,9 @@ export default {
       searchTolerance(this.numVal, this.selParaValue).then(response => {
         if (response.data.length !== 0) { // 防止超出范围报错
           this.tolerance = response.data[0].公差
-        } else { this.$message.error('输入的数值不对！') }
+        } else {
+          this.$message.error('输入的数值不对！')
+        }
       })
     },
     copyAndSave() { // 复制并保存
@@ -980,7 +1105,9 @@ export default {
         this.newNum = ''
         this.$message.success('保存成功')
         this.searchParts()
-      } else { this.$message.error('请核准后保存') }
+      } else {
+        this.$message.error('请核准后保存')
+      }
     },
     insertOne(row) { // 插入行
       if (this.partNumValue === '') {
@@ -1040,7 +1167,9 @@ export default {
         saveMaterial(this.partNumValue, this.material).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('保存成功')
-          } else { this.$message.error('保存失败') }
+          } else {
+            this.$message.error('保存失败')
+          }
         })
       }
     },
@@ -1052,7 +1181,9 @@ export default {
           if (response.data[0].result === '1') {
             this.$message.success('粘贴成功')
             this.searchDetail()
-          } else { this.$message.error('粘贴失败') }
+          } else {
+            this.$message.error('粘贴失败')
+          }
         })
       }
     },
@@ -1074,7 +1205,9 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('删除成功')
               this.searchDetail()
-            } else { this.$message.error('删除失败') }
+            } else {
+              this.$message.error('删除失败')
+            }
           })
         }).catch(() => {
           this.$message({
@@ -1089,16 +1222,19 @@ export default {
 </script>
 
 <style scoped>
-  .doing-row4{
+  .doing-row4 {
     background: #f0f9eb;
   }
-  .el-card{
+
+  .el-card {
     margin-bottom: 15px;
   }
-  .el-date-editor{
-    width:150px
+
+  .el-date-editor {
+    width: 150px
   }
-  span{
+
+  span {
     margin: 10px 0 10px 10px;
   }
 </style>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index e56ed66b..29bc3258 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -42,6 +42,7 @@
       <el-button type="primary" size="small" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="primary" size="small" icon="el-icon-cjn-09" style="" @click="save">保存</el-button>
     </el-card>
+
     <el-card>
       <el-table
         ref="multipleTable"
@@ -131,7 +132,7 @@
         </el-table-column>
       </el-table>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogFormVisible=false">提交</el-button>
+        <el-button type="primary" @click="tijiao()">提交</el-button>
       </div>
     </el-dialog>
   </div>
@@ -143,6 +144,8 @@ import { getProject0, getProject, getGraphNum, getGroupNum, getTable0, getGraphN
 export default {
   data() {
     return {
+      num1: '', // 工艺员中间变量
+      num2: '', // 工艺员流水号中间变量
       loading: false,
       loading0: false,
       projectNameValue: '',
@@ -323,8 +326,13 @@ export default {
       this.dialogFormVisible = true
     },
     confirmPerson(row) { // 选择一行
-      this.tableData[this.index].工艺员 = row.姓名
-      this.tableData[this.index].人员编号 = row.人员编号
+      this.num1 = row.姓名
+      this.num2 = row.人员编号
+    },
+    tijiao() {
+      this.tableData[this.index].工艺员 = this.num1
+      this.tableData[this.index].人员编号 = this.num2
+      this.dialogFormVisible = false
     },
     selectAll(rows) {
       if (this.tableData[0].工艺员 !== '') {
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 58f6697d..33fe4419 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -40,11 +40,11 @@
         <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 200px;"/>
         <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
         <span>进度颜色：</span>
-        <el-radio v-model="radioList" label="0" style="background-color: white">全部</el-radio>
-        <el-radio v-model="radioList" label="1" style="background-color: red">拖期</el-radio>
-        <el-radio v-model="radioList" label="2" style="background-color: yellow">即将拖期</el-radio>
-        <el-radio v-model="radioList" label="3" style="background-color: lawngreen">如期</el-radio>
-        <el-radio v-model="radioList" label="4" style="background-color: deepskyblue">工序外协</el-radio>
+        <!--<span style="background-color: white">全部</span>-->
+        <span style="background-color: red">拖期</span>
+        <span style="background-color: yellow">即将拖期</span>
+        <span style="background-color: lawngreen">如期</span>
+        <span style="background-color: deepskyblue">工序外协</span>
       </el-row>
     </el-card>
 
@@ -396,6 +396,7 @@ export default {
       this.Groups = []
       if (this.project !== '') {
         getMachines(this.project).then(response => {
+          console.log(response.data)
           for (let i = 0; i < response.data.length; i++) {
             this.Machines.push({
               label: response.data[i].机床图号,
@@ -539,7 +540,7 @@ export default {
     background-color: transparent;
     border: 0px solid white;
   }
-  .lightgreen{
+  .green{
     background-color: lightgreen;
     border: 1px solid #1f2d3d;
   }
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index f21e6f59..eaac00f1 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -136,7 +136,7 @@
               type="primary"
               class="el-icon-edit"
               @click="PlateWelding(scope.$index, scope.row, 'form1')">板焊</el-button>
-            <el-button size="mini" type="primary" @click="inBatches">分批</el-button>
+              <!--<el-button size="mini" type="primary" @click="inBatches">分批</el-button>-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b2ff8692..fcaa7b86 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -20,9 +20,13 @@
           :value="item.value"/>
       </el-select>
       <span>机床号:</span>
-      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" clearable style="width:200px" @dblclick.native="SearchMachine" @change="empty1"/>
+      <el-input v-model="machineToolNumber" placeholder="机床号" size="small" readonly clearable style="width:200px" @change="empty1">
+        <el-button slot="append" icon="el-icon-search" @click="SearchMachine" />
+      </el-input>
       <span>组号:</span>
-      <el-input v-model="groupNumber" placeholder="组号" size="small" clearable style="width:200px" @dblclick.native="searchGroupList"/>
+      <el-input v-model="groupNumber" placeholder="组号" size="small" readonly clearable style="width:200px">
+        <el-button slot="append" icon="el-icon-search" @click="searchGroupList" />
+      </el-input>
       <span>零件号:</span>
       <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width:200px"/>
       <br>
@@ -242,7 +246,12 @@
 
 <script>
 import { initProject, intPartState, searchTable, searchmachine, searchgroup, editData } from '@/api/ManufacturingCenter/StatusQuery'
+import elInput from 'element-ui/packages/input'
+
 export default {
+  components: {
+    elInput
+  },
   data() {
     return {
       loading0: false,
@@ -401,6 +410,12 @@ export default {
             if (response.data.result[i].机床结束时间 !== '') {
               response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
             }
+            if (response.data.result[i].工位属性 === '请选择') {
+              response.data.result[i].工位属性 = ''
+            }
+            if (response.data.result[i].机床主管 === '请选择') {
+              response.data.result[i].机床主管 = ''
+            }
           }
           this.tableData6 = response.data.result
           this.total1 = parseInt(response.data.output[0].ItemCount)
diff --git a/src/views/PurchasingCenter/qrcodeGeneration/index.vue b/src/views/PurchasingCenter/qrcodeGeneration/index.vue
new file mode 100644
index 00000000..b26bddc2
--- /dev/null
+++ b/src/views/PurchasingCenter/qrcodeGeneration/index.vue
@@ -0,0 +1,54 @@
+<!--二维码扫描查询-->
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
+        <el-table-column
+          label=" "
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="外协厂家名称" align="center" width="280px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import { searchtable } from '@/api/Outsourcing/OutFactoryMaintenance'
+export default {
+  data() {
+    return {
+      loading0: false,
+      tableData: []
+    }
+  },
+  created() {
+    this.searchTable()
+  },
+  methods: {
+    // 查询
+    searchTable() {
+      this.loading0 = true
+      searchtable(this.pageCurrent, this.pageSize, this.num1, this.ManufacturerNumber, this.num2, this.ManufacturerName, this.num10, this.ManufacturerAbbreviation, this.num3, this.address, this.num4, this.roleName, this.num5, this.phNumber, this.num6, this.Fax, this.num7, this.Remarks, this.num8, this.category, this.num11, this.attention, this.num9, this.EquipmentCondition).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+        this.loading0 = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+</style>