样式

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -340,10 +340,7 @@
 <script>
 import { getEntryNameValue, getToolNum, getNum, getTable, production, getTable1, revisionBatch, editList, dele, production2, edit } from '@/api/ManufacturingCenter/InitialProduction'
 import { mapGetters } from 'vuex'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 export default {
   data() {
@@ -440,10 +437,6 @@ export default {
       'id'
     ])
   },
-<<<<<<< HEAD
-  created() {
-    this.typeChange()
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -457,7 +450,6 @@ export default {
   },
   created() {
     // this.typeChange()
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -528,19 +520,6 @@ export default {
       })
     },
     typeChange() {
-<<<<<<< HEAD
-      this.NumValue = ''
-      this.Num = []
-      getToolNum().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.toolNum.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号,
-            value2: response.data[i].项目名称
-          })
-        }
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.toolNumValue = ''
         this.NumValue = ''
@@ -575,7 +554,6 @@ export default {
           }
         })
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     typeChange1() {
       this.NumValue = ''

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div>
     <el-card>
-<<<<<<< HEAD
-=======
       <span>机床号:</span>
       <el-select v-model="Machine" filterable clearable size="small" style="margin-top:10px;width: 220px" placeholder="机床号" @change="getGroup()">
         <el-option
@@ -22,7 +20,6 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <span>零件图号:</span>
       <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
       <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
@@ -113,13 +110,6 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-=======
 import { getMachines, getGroups, searchtable, searchtable2, searchtable3, change2, change3, edit } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
@@ -131,7 +121,6 @@ export default {
       Machines: [],
       Group: '',
       Groups: [],
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       arrest2: [],
       editTime: '',
       bianliang1: [],
@@ -163,12 +152,6 @@ export default {
       'userId'
     ])
   },
-<<<<<<< HEAD
-  created() {
-    this.searchTable()
-    this.searchTable2()
-  },
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -184,7 +167,6 @@ export default {
   //   this.searchTable()
   //   this.searchTable2()
   // },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     handleSelectionChange2(val) {
       this.arrest2 = val
@@ -204,8 +186,6 @@ export default {
         })
       }
     },
-<<<<<<< HEAD
-=======
     getMachine() {
       if (Cookie.get('machineValue') !== undefined) {
         this.Machine = ''
@@ -258,25 +238,15 @@ export default {
         }
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     // 查询表格数据
     searchTable() {
       this.loading = true
       this.tableData = []
       this.Data = []
-<<<<<<< HEAD
-      if (this.partName !== '' && this.partName !== null) {
-        this.partNamecheck = true
-      } else {
-        this.partNamecheck = false
-      }
-      searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
-=======
       if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false }
       if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false }
       if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false }
       searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         if (response.data.total === 0) {
           this.loading = false
         } else {

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -557,10 +557,7 @@
 <script>
 import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   inject: ['reload'],
   data() {
@@ -650,8 +647,6 @@ export default {
       'id'
     ])
   },
-<<<<<<< HEAD
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -663,45 +658,11 @@ export default {
       }
     }
   },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   created() {
     this.fetchData()
   },
   methods: {
     fetchData() {
-<<<<<<< HEAD
-      initProject().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].机床流水号
-          })
-        }
-      })
-      PartCallbackInformation().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].退回时间 !== '') {
-            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
-          }
-          if (response.data[i].是否确认 === 0) {
-            this.value += 1
-          }
-        }
-        this.tableData9 = response.data
-      })
-      PartCallbackInformation1().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].退回时间 !== '') {
-            response.data[i].退回时间 = (response.data[i].退回时间).split(' ')[0]
-          }
-          if (response.data[i].是否确认 === 0) {
-            this.value1 += 1
-          }
-        }
-        this.tableData10 = response.data
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.machineNumber = []
         initProject().then(response => {
@@ -757,7 +718,6 @@ export default {
           this.tableData10 = response.data
         })
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     PartCallbackInformation() {
       this.dialogFormVisible1 = true

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="app-container">
     <el-card>
-<<<<<<< HEAD
       <div>
         <span style="margin-left: 0">机床号：</span>
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-top: 3px" clearable @change="machineChange">
@@ -33,63 +32,14 @@
             :value="item.value"/>
         </el-select>
         <el-button type="success" size="small" style="margin-left: 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
-=======
-      <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 style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <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>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       </div>
       <el-table
         v-loading="loading"
         :data="tableData"
-<<<<<<< HEAD
         size="mini"
         height="730"
         border
         stripe
-=======
-        style="max-height: 550px"
-        height="550"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         highlight-current-row
         @selection-change="handleSelectionChange"
         @row-click="click">
@@ -140,7 +90,6 @@
       </div>
     </el-card>
     <el-card>
-<<<<<<< HEAD
       <div>
         <el-tooltip effect="dark" content="将在制零件打回，重新编制工艺定额" placement="top">
           <div style="display: inline-block">
@@ -150,11 +99,6 @@
       </div>
     </el-card>
     <el-dialog :visible.sync="dialogFormVisiblePeople" title="工艺流程单" center>
-=======
-      <div slot="header">
-        <el-button v-show="true" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>
-      </div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <div v-if="tableData2.length">
         <table class="tg">
           <tr>
@@ -222,11 +166,7 @@
           </tr>
         </table>
       </div>
-<<<<<<< HEAD
     </el-dialog>
-=======
-    </el-card>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   </div>
 </template>
 
@@ -245,21 +185,14 @@ export default {
       personValue: '',
       person: [],
       pageCurrent: 1,
-<<<<<<< HEAD
       pageSize: 20,
-=======
-      pageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0,
       tableData: [],
       loading: false,
       PrNum: '',
       tableData2: [],
       tableData3: [],
-<<<<<<< HEAD
       dialogFormVisiblePeople: false,
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       机床号: '',
       组号: '',
       零件图号: '',
@@ -352,10 +285,7 @@ export default {
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {
         this.tableData2 = response.data
-<<<<<<< HEAD
         this.dialogFormVisiblePeople = true
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       })
     },
     handleSelectionChange(val) {
@@ -389,16 +319,4 @@ export default {
   .tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
 </style>
 <style scoped>
-<<<<<<< HEAD
-=======
-  span{
-    margin: 10px 0 10px 10px;
-  }
-  .el-card{
-    margin-bottom: 15px;
-  }
-    .el-col{
-        margin-bottom: 10px;
-    }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>

src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue

@@ -2,49 +2,30 @@
   <div class="app-container">
     <el-card>
       <span>工艺员:</span>
-<<<<<<< HEAD
       <el-select v-model="craftmenValue" placeholder="工艺员" size="small" style="margin: 3px;" @change="searchParts()">
-=======
-      <el-select v-model="craftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="searchParts()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in craftmen"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">零件图号:</span>
       <el-select v-model="partNumValue" filterable placeholder="零件图号" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
-=======
-      <span>零件图号:</span>
-      <el-select v-model="partNumValue" filterable placeholder="零件图号" style="margin-right: 10px" size="small" @change="tableData1=[];tableData2=[];returnDate = '';searchData();">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">打回时间:</span>
-=======
-      <span>打回时间:</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-date-picker v-model="returnDate" :clearable="false" type="datetime" placeholder="打回时间" size="small" readonly/>
     </el-card>
 
     <el-row>
       <el-col :span="12">
-<<<<<<< HEAD
         <el-card >
           <div style="display: inline-block;margin: 3px">改前零件工艺</div>
           <el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
-=======
-        <el-card>
-          <div style="display: inline-block;margin-bottom: 20px">改前零件工艺</div>
-          <el-table id="div1" ref="div1" :data="tableData1" :row-class-name="tableRowClassName1" size="mini" border style="height:350px;overflow-y: auto;" @mouseenter.native="changeScrollBefore">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <el-table-column align="center" label="工序顺序" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}
@@ -69,15 +50,9 @@
         </el-card>
       </el-col>
       <el-col :span="12">
-<<<<<<< HEAD
         <el-card>
           <div style="display: inline-block;margin:3px">改后零件工艺</div>
           <el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border highlight-current-row stripe style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
-=======
-        <el-card style="margin-left:15px">
-          <div style="display: inline-block;margin-bottom: 20px">改后零件工艺</div>
-          <el-table id="div2" ref="div2" :data="tableData2" :row-class-name="tableRowClassName2" size="mini" border style="height:350px;overflow-y: scroll;" @mouseenter.native="changeScrollAfter">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <el-table-column align="center" label="工序顺序" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.工序顺序 }}
@@ -276,11 +251,7 @@ export default {
 
 <style scoped>
   .el-card{
-<<<<<<< HEAD
     /*margin-bottom: 15px;*/
-=======
-    margin-bottom: 15px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .el-date-editor{
     width:200px
@@ -292,11 +263,7 @@ export default {
     width:200px
   }
   span{
-<<<<<<< HEAD
     /*margin: 10px 0 10px 10px;*/
-=======
-    margin: 10px 0 10px 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .searchForm .el-form-item{
     margin-bottom: 5px;

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -1,19 +1,11 @@
 <template>
   <div class="app-container">
     <el-card>
-<<<<<<< HEAD
       <el-radio-group v-model="radio" size="small" style="margin-top: 3px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
         <el-radio v-model="radio" :label="1" border>未编制</el-radio>
         <el-radio v-model="radio" :label="2" border style="margin-left: 0px">已编制</el-radio>
       </el-radio-group>
       <span style="margin-left: 10px">工艺员:</span>
-=======
-      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="checked = false;partNum=[];partNumValue = '';typeValue = '';Specifications = '';partName = '';material = '';materialName = '';prepareMateriel = '';spec = '';batchNum = '';searchPartsByMachineGroup();">
-        <el-radio v-model="radio" :label="1">未编制</el-radio>
-        <el-radio v-model="radio" :label="2">已编制</el-radio>
-      </el-radio-group>
-      <span>工艺员:</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();">
         <el-option
           v-for="item in Craftmen"
@@ -25,11 +17,7 @@
       <el-input v-model="partNumber" clearable placeholder="零件号" size="small" style="width:200px">
         <el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
       </el-input>-->
-<<<<<<< HEAD
       <span style="margin-left: 10px">机床-分组或零件号:</span>
-=======
-      <span>机床-分组 或 零件号:</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
         <el-button slot="append" icon="el-icon-right" @click="partNumValue='';searchPartsByMachineGroup();"/>
       </el-input>
@@ -44,7 +32,6 @@
           <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
         </el-option>
       </el-select>
-<<<<<<< HEAD
       <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
       <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
       <!--<el-button v-show="false" plain size="small" style="margin: 10px;float:right" @click="switchEdit()">切换编辑模式</el-button>-->
@@ -57,20 +44,6 @@
         <el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:100px"/>
         <span>投产总数量:</span>
         <el-input v-model="batchNum" readonly size="small" style="width:100px"/>
-=======
-      <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin:10px">是否核准</el-checkbox>
-      <!--<el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整</el-button>-->
-      <!--<el-button v-show="false" 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"/>
-        <span>零件名称:</span>
-        <el-input v-model="partName" placeholder="零件名称" size="small" readonly style="width:115px"/>
-        <span>规格:</span>
-        <el-input v-model="Specifications" placeholder="规格" size="small" readonly style="width:115px"/>
-        <span>投产总数量:</span>
-        <el-input v-model="batchNum" readonly size="small" style="width:80px;margin-top:10px;"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <span>物料:</span>
         <el-input v-model="materialName" placeholder="物料" size="small" style="width:215px" readonly>
           <el-button slot="prepend" icon="el-icon-search" @click="dialogMaterial=true"/>
@@ -81,15 +54,9 @@
       </div>
       <div>
         <el-row>
-<<<<<<< HEAD
           <el-col style="width:180px">
             <span style="margin-left: 0">物料类型:</span>
             <el-select v-model="materielValue" size="small" style="margin-top: 7px;width:100px;margin-bottom: 3px" placeholder="物料类型" @change="clear()">
-=======
-          <el-col style="width:210px">
-            <span>物料类型:</span>
-            <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-option
                 v-for="item in materiel"
                 :key="item.value"
@@ -98,21 +65,12 @@
             </el-select>
           </el-col>
 
-<<<<<<< HEAD
           <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="12" >
             <span >直&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;径:</span>
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
             <el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
-=======
-          <el-col v-show="materielValue==='1'||materielValue==='6'||materielValue==='7'||materielValue==='8'" :span="15">
-            <span>直径:</span>
-            <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <span>长度:</span>
-            <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation1()">计算重量</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
@@ -184,15 +142,9 @@
 
     <el-card>
       <el-row>
-<<<<<<< HEAD
         <span style="margin-left: 0">输入数值:</span>
         <el-input v-model="numVal" size="small" style="width:100px;margin-top: 3px" placeholder="输入数值"/>
         <span style="margin-left: 10px">选择参数:</span>
-=======
-        <span>输入数值:</span>
-        <el-input v-model="numVal" size="small" style="width:100px" placeholder="输入数值"/>
-        <span>选择参数:</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-select v-model="selParaValue" size="small" style="width:100px" placeholder="选择参数">
           <el-option
             v-for="item in selPara"
@@ -201,15 +153,9 @@
             :value="item.value"/>
         </el-select>
         <span>公差:</span>
-<<<<<<< HEAD
         <el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
         <el-button style="margin-left: 10px" type="primary" size="small" @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin-left: 10px" >
-=======
-        <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">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
           </el-button>
           <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
@@ -310,34 +256,22 @@
               <el-button
                 icon="el-icon-arrow-up"
                 type="primary"
-<<<<<<< HEAD
                 size="mini"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 @click="upOne(scope.row)"/>
               <el-button
                 icon="el-icon-arrow-down"
                 type="primary"
-<<<<<<< HEAD
                 size="mini"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 @click="downOne(scope.row)"/>
               <el-button
                 icon="el-icon-circle-plus-outline"
                 type="primary"
-<<<<<<< HEAD
                 size="mini"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 @click="insertOne(scope.row)"/>
               <el-button
                 icon="el-icon-delete"
                 type="danger"
-<<<<<<< HEAD
                 size="mini"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 @click="deleteOne(scope.row)"/>
             </div>
           </template>
@@ -1739,21 +1673,13 @@ export default {
     background: #f0f9eb;
   }
   .el-card {
-<<<<<<< HEAD
     /*margin-bottom: 15px;*/
-=======
-    margin-bottom: 15px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .el-date-editor {
     width: 150px
   }
   span {
-<<<<<<< HEAD
     margin-left: 10px;
-=======
-    margin: 10px 0 10px 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .el-table .change {
     background: oldlace;
@@ -1763,7 +1689,6 @@ export default {
   .processTable{
     .el-input__inner{
       font-weight: bold;
-<<<<<<< HEAD
       font-size: 18px;
       height: 35px;
     }
@@ -1774,17 +1699,6 @@ export default {
     .el-cascader__label{
       font-weight: bold;
       font-size: 18px;
-=======
-      font-size: 20px;
-    }
-    .el-textarea__inner{
-      font-weight: bold;
-      font-size: 20px;
-    }
-    .el-cascader__label{
-      font-weight: bold;
-      font-size: 20px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     }
   }
 </style>

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -6,11 +6,7 @@
         <el-radio :label="2">全部</el-radio>
       </el-radio-group>
       <span>机床图号:</span>
-<<<<<<< HEAD
       <el-select v-model="graphNumValue" filterable size="small" style="margin:3px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
-=======
-      <el-select v-model="graphNumValue" filterable size="small" style="margin-bottom:10px;width: 220px" placeholder="机床图号" @change="getGroupNum()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in graphNum"
           :key="item.value"
@@ -20,26 +16,16 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">组号:</span>
       <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=20;getTable()">
-=======
-      <span>组号:</span>
-      <el-select v-model="GroupNumValue" filterable clearable size="small" placeholder="组号" style="width: 220px" @change="total=0;PageCurrent=1;PageSize=10;getTable()">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in GroupNum"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
       <el-button type="primary" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
-=======
-      <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>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
 
     <el-card>
@@ -47,17 +33,11 @@
         ref="multipleTable"
         :data="tableData"
         style="width: 100%;"
-<<<<<<< HEAD
         size="mini"
         height="770"
         highlight-current-row
         border
         stripe
-=======
-        height="580"
-        highlight-current-row
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection"/>
         <el-table-column align="center" label="零件号">
@@ -109,7 +89,6 @@
       </div>
     </el-card>
 
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
       <el-table
         :data="tableData2"
@@ -117,13 +96,6 @@
         size="mini"
         border
         stripe
-=======
-    <el-dialog :visible.sync="dialogFormVisible" title="工艺定额人员选择" center>
-      <el-table
-        :data="tableData2"
-        style="width: 100%;max-height: 200px"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         height="200px"
         highlight-current-row
         @row-click="confirmPerson">
@@ -181,11 +153,7 @@ export default {
       multipleSelection: [],
       result: 0,
       PageCurrent: 1,
-<<<<<<< HEAD
       PageSize: 20,
-=======
-      PageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0
     }
   },
@@ -398,15 +366,7 @@ export default {
 </script>
 
 <style scoped>
-<<<<<<< HEAD
   span{
    margin-right: 10px;
-=======
-  .el-card{
-    margin-bottom: 15px;
-  }
-  span{
-    margin: 10px 0 10px 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -311,10 +311,7 @@
 </template>
 <script>
 import { getNames, getMachines, getGroups, getTable, getTable2, getExport } from '@/api/ManufacturingCenter/ProcessingStatus'
-<<<<<<< HEAD
-=======
 import Cookie from 'js-cookie'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 export default {
   data() {
@@ -384,12 +381,6 @@ export default {
       pageCurrent: 1
     }
   },
-<<<<<<< HEAD
-  created() {
-    this.getMachine()
-    this.getTableData()
-  },
-=======
   watch: {
     // 如果路由有变化，会再次执行该方法
     '$route': {
@@ -404,7 +395,6 @@ export default {
   // created() {
   //   this.getMachine()
   // },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
@@ -433,10 +423,6 @@ export default {
         })
       })
     },
-<<<<<<< HEAD
-    // 查询供应商名称
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     fetchData() {
       this.projects = []
       getNames().then(response => {
@@ -450,21 +436,6 @@ export default {
       this.part = 1
     },
     getMachine() {
-<<<<<<< HEAD
-      this.Machine = ''
-      this.Machines = []
-      this.Group = ''
-      this.Groups = []
-      getMachines().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.Machines.push({
-            label: response.data[i].机床图号,
-            value: response.data[i].机床流水号,
-            value2: response.data[i].项目名称
-          })
-        }
-      })
-=======
       if (Cookie.get('machineValue') !== undefined) {
         this.Machine = ''
         this.Machines = []
@@ -502,7 +473,6 @@ export default {
         })
         this.getTableData()
       }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     getGroup() {
       this.Group = ''

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -32,12 +32,6 @@
           <span>提前</span>
           <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
           <span>天预警</span>
-<<<<<<< HEAD
-          <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1()">查询</el-button>
-        </el-row>
-      </div>
-      <h1 class="word" style="margin: 0">总计划:</h1>
-=======
           <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
         </el-row>
       </div>
@@ -51,7 +45,6 @@
         <span>外协工时总数:</span>{{ 外协工时总数 ? 外协工时总数 : '-' }}&nbsp;(分)
         <span>采购总额:</span>{{ 零件金额 ? 零件金额 : '-' }}&nbsp;(元)
       </div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table v-loading="loading" :data="tableData10" height="550" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中" @row-click="searchTable">
         <el-table-column label="项目编号" align="center" width="140px" fixed="left">
           <template slot-scope="scope">
@@ -522,18 +515,12 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
-=======
 import { searchAll, initProject, initMachine, searchtable, searchtable2, searchtable5 } from '@/api/ManufacturingCenter/ProjectPlanningQuery'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 import Sticky from '@/components/Sticky'
 export default {
   components: { Sticky },
   data() {
     return {
-<<<<<<< HEAD
-=======
       合同总数: '',
       合同总金额: '',
       已支付: '',
@@ -541,7 +528,6 @@ export default {
       实际加工时间: '',
       外协工时总数: '',
       零件金额: '',
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       projectValue: '',
       projectValue1: '',
       project: [],
@@ -583,9 +569,6 @@ export default {
     this.fetchData()
     this.searchTable1()
   },
-<<<<<<< HEAD
-  methods: {
-=======
   mounted() {
     this.searchAll()
   },
@@ -602,7 +585,6 @@ export default {
         this.零件金额 = response.data[0].零件金额
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     colorJudge(time1, time2) {
       if (time2 === null) {
         if ((new Date(time1) - this.now) > 0 && (new Date(time1) - this.now) < (86400000 * this.warningValue)) {
@@ -654,58 +636,6 @@ export default {
           this.loading = false
         } else {
           for (let i = 0; i < response.data.rows.length; i++) {
-<<<<<<< HEAD
-            if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null) {
-              response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
-            }
-            if (response.data.rows[i].发货节点 !== '' && response.data.rows[i].发货节点 !== null) {
-              response.data.rows[i].发货节点 = response.data.rows[i].发货节点.split(' ')[0]
-            }
-            if (response.data.rows[i].设备预验收节点 !== '' && response.data.rows[i].设备预验收节点 !== null) {
-              response.data.rows[i].设备预验收节点 = response.data.rows[i].设备预验收节点.split(' ')[0]
-            }
-            if (response.data.rows[i].安装调试节点 !== '' && response.data.rows[i].安装调试节点 !== null) {
-              response.data.rows[i].安装调试节点 = response.data.rows[i].安装调试节点.split(' ')[0]
-            }
-            if (response.data.rows[i].机床设计完成时间 !== '' && response.data.rows[i].机床设计完成时间 !== null) {
-              response.data.rows[i].机床设计完成时间 = response.data.rows[i].机床设计完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].采购完成时间 !== '' && response.data.rows[i].采购完成时间 !== null) {
-              response.data.rows[i].采购完成时间 = response.data.rows[i].采购完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].备料完成时间 !== '' && response.data.rows[i].备料完成时间 !== null) {
-              response.data.rows[i].备料完成时间 = response.data.rows[i].备料完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].机床生产完成时间 !== '' && response.data.rows[i].机床生产完成时间 !== null) {
-              response.data.rows[i].机床生产完成时间 = response.data.rows[i].机床生产完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].机床装配完成时间 !== '' && response.data.rows[i].机床装配完成时间 !== null) {
-              response.data.rows[i].机床装配完成时间 = response.data.rows[i].机床装配完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].机床设计实际完成时间 !== '' && response.data.rows[i].机床设计实际完成时间 !== null) {
-              response.data.rows[i].机床设计实际完成时间 = response.data.rows[i].机床设计实际完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].采购实际完成时间 !== '' && response.data.rows[i].采购实际完成时间 !== null) {
-              response.data.rows[i].采购实际完成时间 = response.data.rows[i].采购实际完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].备料实际完成时间 !== '' && response.data.rows[i].备料实际完成时间 !== null) {
-              response.data.rows[i].备料实际完成时间 = response.data.rows[i].备料实际完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].机床生产实际完成时间 !== '' && response.data.rows[i].机床生产实际完成时间 !== null) {
-              response.data.rows[i].机床生产实际完成时间 = response.data.rows[i].机床生产实际完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].机床装配实际完成时间 !== '' && response.data.rows[i].机床装配实际完成时间 !== null) {
-              response.data.rows[i].机床装配实际完成时间 = response.data.rows[i].机床装配实际完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].审图计划开始时间 !== '' && response.data.rows[i].审图计划开始时间 !== null) {
-              response.data.rows[i].审图计划开始时间 = response.data.rows[i].审图计划开始时间.split(' ')[0]
-            }
-            if (response.data.rows[i].审图计划完成时间 !== '' && response.data.rows[i].审图计划完成时间 !== null) {
-              response.data.rows[i].审图计划完成时间 = response.data.rows[i].审图计划完成时间.split(' ')[0]
-            }
-            if (response.data.rows[i].审图实际完成时间 !== '' && response.data.rows[i].审图实际完成时间 !== null) {
-              response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
-=======
             if (response.data.rows[i].合同签订日期 !== '' && response.data.rows[i].合同签订日期 !== null && response.data.rows[i].合同签订日期 !== '1900/1/1 0:00:00') {
               response.data.rows[i].合同签订日期 = response.data.rows[i].合同签订日期.split(' ')[0]
             } else {
@@ -790,7 +720,6 @@ export default {
               response.data.rows[i].审图实际完成时间 = response.data.rows[i].审图实际完成时间.split(' ')[0]
             } else {
               response.data.rows[i].审图实际完成时间 = ''
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             }
             this.tableData10.push({
               项目编号: response.data.rows[i].项目编号,
@@ -851,10 +780,6 @@ export default {
               if (response.data[i].发货节点 !== '' && response.data[i].发货节点 !== null) {
                 response.data[i].发货节点 = response.data[i].发货节点.split(' ')[0]
               }
-<<<<<<< HEAD
-              console.log(response.data[i].设备预验收节点, 11111)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               // if (response.data[i].设备预验收节点 !== '' && response.data[i].设备预验收节点 !== null) {
               //   response.data[i].设备预验收节点 = response.data[i].设备预验收节点.split(' ')[0]
               // }
@@ -902,10 +827,6 @@ export default {
               }
             }
             this.loading = false
-<<<<<<< HEAD
-            console.log(response.data, 222222)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             this.tableData = response.data
           }).then(() => {
             searchtable2(this.machineValue1, 1).then(response => {
@@ -929,10 +850,6 @@ export default {
                 }
               }
               this.loading1 = false
-<<<<<<< HEAD
-              console.log(response.data, 2)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData1 = response.data
             })
             searchtable2(this.machineValue1, 2).then(response => {
@@ -959,13 +876,7 @@ export default {
                 }
               }
               this.loading1 = false
-<<<<<<< HEAD
-              console.log(response.data, 3)
               this.tableData2 = response.data
-              console.log(response.data, 2222)
-=======
-              this.tableData2 = response.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             })
             searchtable2(this.machineValue1, 3).then(response => {
               for (let i = 0; i < response.data.length; i++) {
@@ -991,10 +902,6 @@ export default {
                 }
               }
               this.loading1 = false
-<<<<<<< HEAD
-              console.log(response.data, 4)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData3 = response.data
             })
             searchtable2(this.machineValue1, 4).then(response => {
@@ -1021,17 +928,9 @@ export default {
                 }
               }
               this.loading1 = false
-<<<<<<< HEAD
-              console.log(response.data, 5)
               this.tableData4 = response.data
             })
             searchtable2(this.machineValue1, 5).then(response => {
-              console.log(response.data)
-=======
-              this.tableData4 = response.data
-            })
-            searchtable2(this.machineValue1, 5).then(response => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               for (let i = 0; i < response.data.length; i++) {
                 // this.arrival4.push(new Date(response.data[i].计划完成时间))
                 // if ((this.arrival4[i] - this.now) > 0 && (this.arrival4[i] - this.now) < (86400000 * this.warningValue)) {
@@ -1055,10 +954,6 @@ export default {
                 }
               }
               this.loading1 = false
-<<<<<<< HEAD
-              console.log(response.data, 6)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData5 = response.data
             })
           })

src/views/ManufacturingCenter/RepairTimeEntry/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-<<<<<<< HEAD
     <el-card>
       <span>人员名称:</span>
       <el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:3px;" @dblclick.native="dialogTableVisible"/>
@@ -10,68 +9,32 @@
 
     <el-card>
       <el-table v-loading="loading0" :data="tableData" height="770" highlight-current-row size="mini" style="width: 100%;margin-top:3px" border stripe>
-=======
-
-    <el-card>
-
-      <span>人员名称:</span>
-      <el-input v-model="personnelNumber" placeholder="请选择人员名称" class="input-with-select" readonly clearable size="small" style="width:200px;margin:10px;">
-        <el-button slot="append" icon="el-icon-search" size="small" @click="dialogTableVisible"/>
-      </el-input>
-      <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=10;searchTable()">查询</el-button>
-      <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
-
-    </el-card>
-
-    <el-card>
-      <el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column
           label="序号"
           type="index"
           align="center"
           width="50"/>
-<<<<<<< HEAD
         <el-table-column label="零件图号" align="center">
-=======
-        <el-table-column label="零件图号" align="center" width="280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.零件图号_零件工艺计划 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="修补工时" align="center">
-=======
-        <el-table-column label="修补工时" align="center" width="110px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="年" align="center">
-=======
-        <el-table-column label="年" align="center" width="100px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.年 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="月" align="center">
-=======
-        <el-table-column label="月" align="center" width="100px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.月 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="人员" align="center">
-=======
-        <el-table-column label="人员" align="center" width="140px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
@@ -81,7 +44,6 @@
             {{ scope.row.修补工艺 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" align="center" width="200px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -103,20 +65,6 @@
                   @click="handleDelete(scope.$index, scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" align="center" width="250px" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              class="el-icon-delete"
-              @click="handleDelete(scope.$index, scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
@@ -238,11 +186,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-<<<<<<< HEAD
         <el-table :data="List1" highlight-current-row height="400" stripe border size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
-=======
-        <el-table :data="List1" highlight-current-row height="400" style="width: 400px;float: left;margin-left: 30px" @row-click="handleCurrentChange2">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="考勤编号" align="center" >
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}
@@ -258,11 +202,7 @@
               {{ scope.row.性别 }}
             </template>
           </el-table-column>
-<<<<<<< HEAD
           <el-table-column label="工作岗位" align="center" show-overflow-tooltip>
-=======
-          <el-table-column label="工作岗位" align="center">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <template slot-scope="scope">
               {{ scope.row.岗位名称 }}
             </template>
@@ -320,11 +260,7 @@ export default {
       count1: 0, // 清表单验证计数器
       count2: 0, // 清表单验证计数器
       tableData: [], // 表格数据
-<<<<<<< HEAD
       pageSize: 20,
-=======
-      pageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       pageCurrent: 1,
       total: 0,
       dialogFormVisible: false,
@@ -530,11 +466,7 @@ export default {
         if (this.count1 !== 1) {
           this.$refs[formName].resetFields()
         }
-<<<<<<< HEAD
         this.title1 = '新增修补工时'
-=======
-        this.title1 = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         this.dialogFormVisible = true
       }
     },
@@ -546,11 +478,7 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
               this.pageCurrent = 1
-<<<<<<< HEAD
               this.pageSize = 20
-=======
-              this.pageSize = 10
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.searchTable()
               this.dialogFormVisible = false
             } else {
@@ -578,11 +506,7 @@ export default {
       this.form.timeNumber = row.修补工时
       this.form.修补工艺 = row.修补工艺
       this.dialogFormVisible = true
-<<<<<<< HEAD
       this.title1 = '编辑修补工时'
-=======
-      this.title1 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     // 编辑确定
     handleChange() {
@@ -630,13 +554,7 @@ export default {
 </script>
 
 <style scoped>
-<<<<<<< HEAD
   /*.el-card{*/
   /*  margin-bottom: 15px;*/
   /*}*/
-=======
-  .el-card{
-    margin-bottom: 15px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -237,11 +237,7 @@
       </el-table>
     </el-card>
 
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
-=======
-    <el-dialog :visible.sync="dialogeditVisible" title="停产" width="400px" center >
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form" :model="form" label-position="left">
         <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
           <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
@@ -324,10 +320,7 @@ export default {
       MachineDrawing: [], // 机床图号下拉框
       TeamValue: '', // 组号
       Team: [], // 组号下拉框
-<<<<<<< HEAD
       title: '',
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       currentPage1: 1,
       pageSize1: 10,
       total1: null,
@@ -452,12 +445,8 @@ export default {
       this.remark1 = ''
       this.remark2 = ''
       this.form2.reason = ''
-<<<<<<< HEAD
       this.title = row.零件名称
       this.form2.time = new Date()
-=======
-      this.form2.time = ''
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号
       if (row.批次零件状态 === '2') {

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -85,17 +85,12 @@
         size="small"
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
-<<<<<<< HEAD
       <el-tooltip effect="dark" content="设定设备参数有效时间" placement="top">
         <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
       </el-tooltip>
       <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
         <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
-=======
-      <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px" @click="setUp">设定</el-button>
-      <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
 
     <el-dialog :title="title" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="800px">
@@ -262,11 +257,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-<<<<<<< HEAD
       this.title = '新增车间设备'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form = {
         设备名称: '',
         设备编号: '',
@@ -285,11 +276,7 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
-<<<<<<< HEAD
       this.title = row.设备名称
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible = true
       this.form.设备名称 = row.设备名称
       this.form.设备编号 = row.设备编号