创建采购合同和零件导入

src/api/BasicData/PersonnelManagement.js

@@ -330,3 +330,25 @@ export function delPost(num1) {
     }
   })
 }
+export function quit(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 2,
+      name: '人事档案管理_人员_离职操作',
+      param: '人员编号=' + num1 + '=int'
+    }
+  })
+}
+export function searchLeavingList(pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 1,
+      name: '人事档案管理_人员_离职人员查询',
+      pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}

src/api/Inventory/ExchangePart.js

@@ -85,14 +85,14 @@ export function addExchangepart(data1, data2, data3, data4, data5, data6, data7,
   })
 }
 // 删除交换单
-export function dropExchangeList(PickingListNumberx, data) {
+export function dropExchangeList(PickingListNumberx) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
       name: '库存管理_交换件_交换件删除',
-      param: '交换单流水号=' + PickingListNumberx + '&交换件组件零件流水号=' + data
+      param: '交换单流水号=' + PickingListNumberx
     }
   })
 }

src/icons/svg/OutsourcingTaskQuery.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1543559071353" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1472" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M408.2 723h50v50h-50v-50z m80 50h50v-50h-50v50z m264.9-230.1l-35.4 35.4L862.5 723H578.2v50h284.3L717.7 917.7l35.4 35.4L958.2 748 753.1 542.9zM321.9 291.6C321.9 181 411.5 91.4 522 91.4S722.1 181 722.1 291.5 632.5 491.7 522 491.7s-200.1-89.6-200.1-200.1z m50 0c0 40.1 15.6 77.8 44 106.2s66.1 44 106.2 44c40.1 0 77.8-15.6 106.2-44 28.4-28.4 44-66.1 44-106.2 0-40.1-15.6-77.8-44-106.2-28.4-28.4-66.1-44-106.2-44-40.1 0-77.8 15.6-106.2 44-28.4 28.4-44 66.1-44 106.2zM512 604.8c-52.5 0-103.4-9.2-151.3-27.3 4-1.9 8-3.8 12-5.6 44.1-19.6 91-29.5 139.3-29.5 42.1 0 83.1 7.5 122.1 22.4l39.5-37.7C624 504.7 569.4 492.3 512 492.3c-226.4 0-410 192.5-410 430 0 3.4 0 6.9 0.1 10.3h50c-0.1-3.4-0.1-6.8-0.1-10.3 0-51.6 9.6-101.6 28.6-148.7 18.3-45.3 44.4-86 77.7-120.9 15.4-16.2 32-30.7 49.6-43.5 60.9 29.1 130.4 45.5 204.1 45.5 9.7 0 19.2-0.3 28.7-0.8l61.3-58.5c-29.2 6.2-59.3 9.4-90 9.4z" fill="" p-id="1473"></path></svg>

src/utils/request.js

@@ -7,8 +7,8 @@ export const wsuri = `ws://192.168.1.149:61101//WebMoudule//websocket`
 export const name = `OP8888`
 
 // 创建axios实例
-export const upload = `http://123.56.95.229:8411/submit/uploadFile.ashx`
+export const upload = `http://localhost:8411/submit/uploadFile.ashx`
-export const download = `http://123.56.95.229:8411/submit/downloadFile.ashx`
+export const download = `http://localhost:8411/submit/downloadFile.ashx`
 const service = axios.create({
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,

src/views/BasicData/PersonnelManagement/index.vue

@@ -15,6 +15,8 @@
             <el-button slot="append" icon="el-icon-search" @click="fetchPeopleForName"/>
           </el-input>
           <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
+          <el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button>
+          <el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button>
           <!--<el-button v-popover:popover4 type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动-->
           <!--</el-button>-->
           <!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
@@ -51,7 +53,7 @@
 
     <el-row>
       <el-col :span="6">
-        <el-card class="box-card" style="min-height: 743px; max-height: 743px">
+        <el-card class="box-card" style="min-height: 700px; max-height: 743px">
           <div slot="header" class="clearfix">
             <span>部门维护</span>
             <el-button style="float: right; padding: 3px 0" type="text" @click="expandALL()">展开</el-button>
@@ -77,9 +79,10 @@
             stripe
             tooltip-effect="dark"
             style="width: 100%"
-            height="679"
+            height="659"
             highlight-current-row
             border
+            size="mini"
             @selection-change="handleSelectionChange">
             <el-table-column
               type="selection"
@@ -168,7 +171,7 @@
             <el-pagination
               :current-page="PageCurrent"
               :page-sizes="[10, 20, 30, 40]"
-              :page-size="10"
+              :page-size="PageSize"
               :total="total"
               layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
@@ -291,14 +294,108 @@
         <el-button v-else-if="people_title === '编辑人员'" type="primary" @click="submitEditPeople">确定</el-button>
       </div>
     </el-dialog>
+
+    <!--离职名单-->
+    <el-dialog :visible.sync="LeavingListVisiable" title="离职名单" center style="height: 800px" width="80%">
+      <el-table
+        :data="LeavingList"
+        stripe
+        tooltip-effect="dark"
+        style="width: 100%"
+        height="500"
+        highlight-current-row
+        border
+        size="mini">
+        <el-table-column align="center" label="部门名称" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.节点名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="考勤编号" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.考勤编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="密码" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.密码 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="姓名" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="性别" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.性别 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="身份证号" width="165">
+          <template slot-scope="scope">
+            {{ scope.row.身份证号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="学历" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.学历名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="入职时间" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.入公司时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="出生日期" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.出生日期 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="联系方式" width="110">
+          <template slot-scope="scope">
+            {{ scope.row.联系电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="岗位工种" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.岗位名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="民族" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.民族 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="家庭住址" width="200">
+          <template slot-scope="scope">
+            {{ scope.row.家庭住址 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block" style="margin-top: 10px;">
+        <el-pagination
+          :current-page="PageCurrentN"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="PageSizeN"
+          :total="totalN"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChangeN"
+          @current-change="handleCurrentChangeN"/>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople } from '@/api/BasicData/PersonnelManagement'
+import { getTree, tree, getTablePeople, getTablePeopleForName, addDepartmentName, delList, editList, delPeopleList, fetchEducationData, fetchPostData, addPeople, editPeople, quit, searchLeavingList } from '@/api/BasicData/PersonnelManagement'
 export default {
   data() {
     return {
+      PageCurrentN: 1,
+      PageSizeN: 10,
+      totalN: null,
+      LeavingList: [],
+      LeavingListVisiable: false,
       departmentData: [],
       expandAll: true,
       i: 1,
@@ -449,6 +546,7 @@ export default {
               if (response.data[0].result === '1') {
                 this.getTreeData()
                 this.$message.success('添加成功')
+                this.i = 0
               } else {
                 this.$message.error('添加失败')
               }
@@ -458,6 +556,7 @@ export default {
               if (response.data[0].result === '1') {
                 this.getTreeData()
                 this.$message.success('添加成功')
+                this.i = 1
               } else {
                 this.$message.error('添加失败')
               }
@@ -537,26 +636,26 @@ export default {
       }
     },
     addPeople() {
-      this.people_title = '新增人员'
-      this.people_DFV = true
-      this.addForm('people_form')
-    },
-    submitAddPeople() {
-      this.people_DFV = false
       if (this.id) {
-        addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
+        this.people_title = '新增人员'
-          if (response.data[0].result === '1') {
+        this.people_DFV = true
-            this.i = 1
+        this.addForm('people_form')
-            this.handleNodeClick()
-            this.$message.success('添加成功')
-          } else {
-            this.$message.error('添加失败')
-          }
-        })
       } else {
         this.$message.warning(`请选择部门名称`)
       }
     },
+    submitAddPeople() {
+      this.people_DFV = false
+      addPeople(this.id, this.people_form.Sex, this.people_form.Education, this.people_form.Address, this.people_form.Nation, this.people_form.Post, this.people_form.AccountNumber, this.people_form.Password, this.people_form.Name, this.people_form.IDcard, this.people_form.TimeOfEntry, this.people_form.Birthday, this.people_form.ContactInformation).then(response => {
+        if (response.data[0].result === '1') {
+          this.i = 0
+          this.handleNodeClick()
+          this.$message.success('添加成功')
+        } else {
+          this.$message.error('添加失败')
+        }
+      })
+    },
     handleEditPeople(row) {
       this.people_title = '编辑人员'
       this.people_DFV = true
@@ -592,6 +691,7 @@ export default {
     },
     deletePeopleTable(row) {
       this.deleteRow(delPeopleList, row.人员编号, function() { this.id ? this.handleNodeClick() : this.feathPeopleForName() })
+      this.i = 0
     },
     postMaintain() {
 
@@ -611,8 +711,49 @@ export default {
         this.total = response.data.total
       })
     },
+    handleSizeChangeN(val) {
+      this.PageSizeN = val
+      this.PageCurrentN = 1
+      this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
+    },
+    handleCurrentChangeN(val) {
+      this.PageCurrentN = val
+      this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val
+    },
+    Quit() {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选择进行离职操作的员工')
+      } else {
+        this.$confirm('此操作将永久删除该行, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.multipleSelection.length; i++) {
+            quit(this.multipleSelection[i].人员编号).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('离职成功')
+                getTablePeople(this.id, this.PageCurrent, this.PageSize).then(response => {
+                  this.List = response.data.rows
+                  this.total = response.data.total
+                })
+              } else { this.$message.error('离职失败') }
+            })
+          }
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消离职操作'
+          })
+        })
+      }
+    },
+    searchLeavingList() {
+      this.LeavingListVisiable = true
+      this.getTable(searchLeavingList, [this.PageCurrentN, this.PageSizeN], ['LeavingList', 'totalN'])
     }
   }
 }

src/views/BasicData/WorkshopPersonnelRoleMana/index.vue

@@ -277,6 +277,7 @@ export default {
         this.check2 = 0
       }
       searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response)
         this.tableData = response.data.rows
         this.total1 = response.data.total
       })

src/views/BasicData/WorkshopProcessMaintenance/index.vue

@@ -25,15 +25,15 @@
             stripe
             tooltip-effect="dark"
             style="width: 100%"
-            height="700"
+            height="700">
-            highlight-current-row
+            <el-table-column align="center" label=" " width="50px">
-            border>
-            <el-table-column align="center" label="流水号" width="80">
               <template slot-scope="scope">
-                <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)"/>
+                <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
+                  {{ a }}
+                </el-radio>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="工艺分类">
+            <el-table-column align="left" label="工艺分类">
               <template slot-scope="scope">
                 {{ scope.row.工艺分类名称 }}
               </template>
@@ -191,6 +191,7 @@ export default {
   data() {
     return {
       // 工艺分类所需变量
+      a: '',
       expands: [],
       tableData1: [],
       ProcessNum: '',
@@ -318,27 +319,41 @@ export default {
         if (valid) {
           if (this.temp === 1) {
             this.submitaddProcessClassification()
-            this.form1 = {}
+            this.form1 = {
+              ProcessClassification: ''
+            }
             this.temp = null
           } else if (this.temp === 2) {
             this.submitProcessClassification()
-            this.form1 = {}
+            this.form1 = {
+              ProcessClassification: ''
+            }
             this.temp = null
           } else if (this.temp === 3) {
             this.submitaddProcess()
-            this.form2 = {}
+            this.form2 = {
+              Process: '',
+              ProcessShort: ''
+            }
             this.temp = null
           } else if (this.temp === 4) {
             this.submiteditProcess()
-            this.form2 = {}
+            this.form2 = {
+              Process: '',
+              ProcessShort: ''
+            }
             this.temp = null
           } else if (this.temp === 5) {
             this.submitTechnologicalRequirements()
-            this.form3 = {}
+            this.form3 = {
+              TechnologicalRequirements: ''
+            }
             this.temp = null
           } else if (this.temp === 6) {
             this.submiteditTechnologicalRequirements()
-            this.form3 = {}
+            this.form3 = {
+              TechnologicalRequirements: ''
+            }
             this.temp = null
           }
         }
@@ -371,9 +386,16 @@ export default {
       this.dialogFormVisible4 = false
       this.dialogFormVisible5 = false
       this.dialogFormVisible6 = false
-      this.form1 = {}
+      this.form1 = {
-      this.form2 = {}
+        ProcessClassification: ''
-      this.form3 = {}
+      }
+      this.form2 = {
+        Process: '',
+        ProcessShort: ''
+      }
+      this.form3 = {
+        TechnologicalRequirements: ''
+      }
     },
     getCurrentRow(row) {
       searchProcessClassificationOfProcessClassificationNum(this.radio).then(response => {

src/views/Inventory/ExchangePart/index.vue

@@ -513,7 +513,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        dropExchangeList(this.exchangeListNumber, this.eTeamPartNumber).then(response => {
+        dropExchangeList(this.exchangeListNumber).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.dialogFormVisible = false

src/views/Inventory/InventoryManagement/index.vue

@@ -450,7 +450,7 @@ export default {
             this.getTable()
             this.$message.success('删除成功')
           } else {
-            this.$message.error('删除失败')
+            this.$message.error('数据占用')
           }
         })
       })

src/views/Inventory/PickingList/index.vue

@@ -729,7 +729,7 @@ export default {
             this.$message.success('删除成功')
             this.searchListinfor()
           } else {
-            this.$message.error('删除失败')
+            this.$message.error('数据占用')
           }
         })
       }).catch(() => {
@@ -752,7 +752,7 @@ export default {
             this.$message.success('删除成功')
             this.searchListDetailt()
           } else {
-            this.$message.error('删除失败')
+            this.$message.error('数据占用')
           }
         })
       }).catch(() => {

src/views/ManufacturingCenter/ProcessPlanning/index.vue

@@ -205,7 +205,7 @@
           @current-change="handleCurrentChange"/>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="dialogMaterial=false">提交</el-button>
+        <el-button type="primary" size="small" @click="selectMaterial2()">提交</el-button>
       </div>
     </el-dialog>
 
@@ -616,7 +616,9 @@ export default {
       result: 0,
       oldNum: '',
       newNum: '',
-      tableRecord: []
+      tableRecord: [],
+      materialName2: '',
+      material2: ''
     }
   },
   created() {
@@ -635,15 +637,6 @@ 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'
-    //       }
-    //     }
-    //   }
-    // },
     returnEdit() { // 在制零件工艺修改
       if (this.partNumValue === '' || this.partNumValue === null) {
         this.$message.error('请选择零件')
@@ -688,10 +681,17 @@ export default {
       }
     },
     selectMaterial(row) { // 选择材质
+      this.materialName2 = ''
+      this.material2 = ''
+      this.materialName2 = row.材料
+      this.material2 = row.材料流水号
+    },
+    selectMaterial2() {
       this.materialName = ''
       this.material = ''
-      this.materialName = row.材料
+      this.materialName = this.materialName2
-      this.material = row.材料流水号
+      this.material = this.material2
+      this.dialogMaterial = false
     },
     fetchData() {
       this.materialClass = []
@@ -923,10 +923,8 @@ export default {
           this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级
           this.tableData[i].工艺要求 = this.tableData2[i].工艺要求
           selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工艺序号, this.tableData2[i].工艺要求).then(response => {
-            console.log('该工艺保存成功', 501)
           })
           hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级).then(response => {
-            console.log(response.data, '难度等级修改成功', 502)
           })
           this.dialogFormVisible = false
         }
@@ -970,7 +968,6 @@ export default {
         this.$message.error('请在主界面选择一个零件作为被拷贝对象')
       } else {
         gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺
-          console.log('已拷贝到主表', 503)
           this.searchDetail()
         })
       }
@@ -985,18 +982,15 @@ export default {
         }
       }
       gongyiYQ(this.num).then(response => {
-        console.log(response.data, 119)
         this.tableData4 = response.data
       })
     },
     hardEdit(row) { // 修改难度等级
       hardEdit(row.工序流水号, row.工艺难度等级).then(response => {
-        console.log(response.data, '难度等级修改成功', 504)
       })
     },
     requestEdit(row) { // 修改工艺要求
       requestEdit(row.工序流水号, row.工艺要求).then(response => {
-        console.log(response.data, '工艺要求修改成功', 505)
       })
     },
     tableSearch(index) { // 主界面工艺名称分类、工艺名称及工艺要求后续查询
@@ -1027,7 +1021,10 @@ export default {
       }
     },
     cChange() { // 工艺名称分类改变
+      this.processNameValue = ''
       this.processName = []
+      this.processRequestValue = ''
+      this.processRequest = []
       for (let i = 0; i < this.processNameClass.length; i++) {
         if (this.processNameClassValue === this.processNameClass[i].value) {
           processNameSelect(this.processSelect[i].value).then(response => { // 查询工艺名称
@@ -1042,6 +1039,7 @@ export default {
       }
     },
     nChange() { // 工艺名称改变
+      this.processRequestValue = ''
       this.processRequest = []
       for (let i = 0; i < this.processName.length; i++) {
         if (this.processNameValue === this.processName[i].value) {
@@ -1063,7 +1061,6 @@ export default {
       this.tableData[this.index].工艺要求 = this.str
       this.dialogFormVisible2 = false
       selectRequest(this.tableData[this.index].工序流水号, this.tableData[this.index].工艺计划流水号, this.tableData[this.index].工艺编号, this.tableData[this.index].工序顺序, this.tableData[this.index].工艺要求).then(response => {
-        console.log('该工艺保存成功', 506)
       })
     },
     calTol() { // 计算公差
@@ -1114,7 +1111,6 @@ export default {
         this.$message.error('请先选择一个零件')
       } else {
         insertOne(this.partNumValue, row.工序流水号).then(response => {
-          console.log(response.data, '插入成功', 507)
           this.searchDetail()
         })
       }
@@ -1145,7 +1141,6 @@ export default {
         this.$message.error('请先选择一个零件')
       } else {
         upOne(this.partNumValue, row.工序流水号).then(response => {
-          console.log(response.data, '上移成功', 508)
           this.searchDetail()
         })
       }
@@ -1155,7 +1150,6 @@ export default {
         this.$message.error('请先选择一个零件')
       } else {
         downOne(this.partNumValue, row.工序流水号).then(response => {
-          console.log(response.data, '下移成功', 509)
           this.searchDetail()
         })
       }
@@ -1198,7 +1192,6 @@ export default {
         }).then(() => {
           for (let i = 0; i < 30; i++) {
             hardEdit(this.tableData[i].工序流水号, '').then(response => {
-              console.log(response.data, '清空难度等级', 510)
             })
           }
           deleteTable(this.newNum).then(response => {

src/views/ManufacturingCenter/QuotaFormulation/index.vue

@@ -175,7 +175,7 @@ export default {
     this.fetchData()
   },
   methods: {
-    fetchData() { // 初始化未编制零件号、材料、公差
+    fetchData() { // 初始化未编制零件号
       getPerson().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.person.push({
@@ -255,49 +255,61 @@ export default {
       this.num0 = ''
       if (this.radio === 1) {
         detailInfo(this.partNumValue).then(response => {
-          this.typeValue = response.data[0].零件类型名称
+          if (response.data.length !== 0) {
-          this.partName = response.data[0].零件名称
+            this.typeValue = response.data[0].零件类型名称
-          this.batchNum = response.data[0].批次数量
+            this.partName = response.data[0].零件名称
-          this.num0 = response.data[0].工艺计划流水号
+            this.batchNum = response.data[0].批次数量
-          console.log(response.data[0].工艺计划流水号, 520)
+            this.num0 = response.data[0].工艺计划流水号
-          this.material = response.data[0].材料
+            this.material = response.data[0].材料
+          }
+        }).then(() => {
           mainTable(this.num0).then(response => {
-            for (let i = 0; i < response.data.length; i++) {
+            if (response.data.length === 0) {
-              this.tableData.push({
+              this.listLoading = false
-                name: response.data[i].工艺名称,
+            } else {
-                request: response.data[i].工艺要求,
+              for (let i = 0; i < response.data.length; i++) {
-                num1: response.data[i].工序流水号,
+                this.tableData.push({
-                Settlement: response.data[i].准结定额工时,
+                  name: response.data[i].工艺名称,
-                singleton: response.data[i].单件定额工时,
+                  request: response.data[i].工艺要求,
-                lingjian: response.data[i].零件图号,
+                  num1: response.data[i].工序流水号,
-                numm: response.data[i].工艺计划流水号
+                  Settlement: response.data[i].准结定额工时,
-              })
+                  singleton: response.data[i].单件定额工时,
+                  lingjian: response.data[i].零件图号,
+                  numm: response.data[i].工艺计划流水号
+                })
+              }
+              this.listLoading = false
             }
-            this.listLoading = false
           })
         })
       } else {
         detailInfo(this.partNumValue).then(response => {
-          this.typeValue = response.data[0].零件类型名称
+          if (response.data.length !== 0) {
-          this.partName = response.data[0].零件名称
+            this.typeValue = response.data[0].零件类型名称
-          this.batchNum = response.data[0].批次数量
+            this.partName = response.data[0].零件名称
-          this.num0 = response.data[0].工艺计划流水号
+            this.batchNum = response.data[0].批次数量
-          this.material = response.data[0].材料
+            this.num0 = response.data[0].工艺计划流水号
-        })
+            this.material = response.data[0].材料
-        mainTable1(this.partNumValue).then(response => {
-          for (let i = 0; i < response.data.length; i++) {
-            this.tableData.push({
-              name: response.data[i].工艺名称,
-              request: response.data[i].工艺要求,
-              num1: response.data[i].工序流水号,
-              Settlement: response.data[i].准结定额工时,
-              singleton: response.data[i].单件定额工时,
-              budget: response.data[i].外协预算价格1,
-              lingjian: response.data[i].零件图号,
-              numm: response.data[i].工艺计划流水号
-            })
           }
-          this.listLoading = false
+        }).then(() => {
+          mainTable1(this.partNumValue).then(response => {
+            if (response.data.length === 0) {
+              this.listLoading = false
+            } else {
+              for (let i = 0; i < response.data.length; i++) {
+                this.tableData.push({
+                  name: response.data[i].工艺名称,
+                  request: response.data[i].工艺要求,
+                  num1: response.data[i].工序流水号,
+                  Settlement: response.data[i].准结定额工时,
+                  singleton: response.data[i].单件定额工时,
+                  budget: response.data[i].外协预算价格1,
+                  lingjian: response.data[i].零件图号,
+                  numm: response.data[i].工艺计划流水号
+                })
+              }
+            }
+          })
         })
       }
     },

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -8,7 +8,7 @@
     </el-card>
 
     <el-card>
-      <el-table :data="List" style="height: 550px" border size="small">
+      <el-table :data="List" border size="small">
         <el-table-column label="设备名称" align="center" >
           <template slot-scope="scope">
             {{ scope.row.设备名称 }}
@@ -159,6 +159,7 @@
       </div>
     </el-dialog>
   </div>
+
 </template>
 
 <script>
@@ -184,7 +185,8 @@ export default {
         { value: '3', label: 3 },
         { value: '4', label: 4 }],
       form: {
-        设备名称: '', 设备编号: '',
+        设备名称: '',
+        设备编号: '',
         设备型号: '',
         设备性能指标: '',
         设备加工能力: '',
@@ -209,9 +211,11 @@ export default {
   },
   created() {
     this.initialization()
+    this.fetchData()
   },
   methods: {
     fetchData() {
+      this.List = []
       if (this.equipmentName !== '') {
         this.check = 1
       } else {
@@ -317,6 +321,9 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        if (this.List && this.List.length === 1 && this.pageCurrent > 1) {
+          this.pageCurrent--
+        }
         deleteTable(row.设备流水号).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('删除成功')

src/views/MarketingCenter/DeliveryManagement/index.vue

@@ -1046,6 +1046,7 @@ export default {
         this.form3.数量 = ''
         if (response.data[0].result === '1') {
           this.searchCargoBoxDetailed()
+          this.searchPackingListDetails()
           searchParts(this.code).then(response => {
             this.tableData4 = response.data
           })

src/views/Outsourcing/InterBudgetaryBudgets/index.vue

@@ -281,6 +281,7 @@ export default {
       this.tableData = []
       if (this.radio === 1) {
         searchPartNum1(this.check_entryNameValue, this.entryNameValue, this.check_toolNumValue, this.toolNumValue, this.check_NumValue, this.NumValue, this.check_partName, this.partName, 0, this.pageCurrent2, this.pageSize2).then(response => {
+          console.log(response.data)
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }).then(() => {

src/views/Outsourcing/PreorderAssociation/index.vue

@@ -85,15 +85,22 @@
           type="index"
           align="center"
           width="50"/>
-        <el-table-column label="序间外协" width="100" align="center">
+        <el-table-column label="加工状态" width="100" align="center">
           <template slot-scope="scope">
-            <el-checkbox v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
+            <el-tag v-if="parseInt(scope.row.工序状态)===3" type="success" size="small">未加工</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===4" size="small">已完成</el-tag>
+            <el-tag v-if="parseInt(scope.row.工序状态)===5" size="small">停产</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="外协状态" width="100" align="center">
+        <el-table-column label="序间外协" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">外协</el-tag>
+            <el-checkbox :disabled="parseInt(scope.row.工序状态)!==3" v-model="checkBox[scope.$index]" @change="edit(scope.$index, scope.row)">选择</el-checkbox>
-            <el-tag v-else size="small">自制</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否外协" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="parseInt(scope.row.工序间是否外协)===2" type="success" size="small">是</el-tag>
+            <el-tag v-else size="small">否</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="工艺名称" align="center" width="220px">