diff --git a/dist.zip b/dist.zip
deleted file mode 100644
index 75cbacf5..00000000
Binary files a/dist.zip and /dev/null differ
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index d16b5a98..d193e8f0 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -1,26 +1,11 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
-// 外购备料出库
-export function change3(Number, code, num) {
-=======
 // 机床名称
 export function getMachines() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   return request({
     url: '',
     method: 'post',
     data: {
-<<<<<<< HEAD
-      type: '2',
-      name: '车间生产管理工艺_自家备料到货更改',
-      param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
-    }
-  })
-}
-// 查询零件
-export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
-=======
       type: '1',
       name: '机床名称流水号_查询数据'
     }
@@ -41,24 +26,17 @@ export function getGroups(stepNumber) {
 
 // 查询零件
 export function searchtable(num1, num2, num3, num4, num5, num6, num7, pageCurrent, pageSize) {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询',
-<<<<<<< HEAD
-      param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3,
-=======
       param: '机床流水号_check=' + num1 + '&机床流水号=' + num2 + '&组件流水号_check=' + num3 + '&组件流水号=' + num4 + '&零件图号_check=' + num5 + '&零件图号=' + num6 + '&备料到货_check=' + num7,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-<<<<<<< HEAD
-=======
 // 外购备料出库
 export function change3(Number, code, num) {
   return request({
@@ -71,7 +49,6 @@ export function change3(Number, code, num) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询零件工艺
 export function searchtable2(num1) {
   return request({
diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js
index a682c0d0..3d1c1f62 100644
--- a/src/api/ManufacturingCenter/ParseQuery.js
+++ b/src/api/ManufacturingCenter/ParseQuery.js
@@ -10,8 +10,6 @@ export function SelectMachine() {
     }
   })
 }
-<<<<<<< HEAD
-=======
 export function ProcessOutsourcing() {
   return request({
     url: '',
@@ -34,4 +32,3 @@ export function ProcessProportion() {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/api/ManufacturingCenter/ProjectPlanningQuery.js b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
index 937170e9..176b07ba 100644
--- a/src/api/ManufacturingCenter/ProjectPlanningQuery.js
+++ b/src/api/ManufacturingCenter/ProjectPlanningQuery.js
@@ -59,8 +59,6 @@ export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num
     }
   })
 }
-<<<<<<< HEAD
-=======
 // 查询项目总信息
 export function searchAll(num1, num2) {
   return request({
@@ -73,4 +71,3 @@ export function searchAll(num1, num2) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js
index 75d72f0a..f0f8d699 100644
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -1,7 +1,5 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
-=======
 // 查询询价单号
 export function getBillNum(num) {
   return request({
@@ -23,7 +21,6 @@ export function getGongyings(num) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询全部未询价的标准件和外购件
 export function getExport1(num) {
   return request({
@@ -154,11 +151,7 @@ export function searchSheetDetail(num2) {
   })
 }
 // 创建询价单
-<<<<<<< HEAD
-export function createInquirySheet(num1, num2, remark, id) {
-=======
 export function createInquirySheet(num1, id, num2, remark) {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   return request({
     url: '',
     method: 'post',
diff --git a/src/api/PurchasingCenter/InvoiceSettlementApplication.js b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
index c3126079..198aeb3b 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApplication.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApplication.js
@@ -1,7 +1,5 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
-=======
 export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
   return request({
     url: '',
@@ -13,7 +11,6 @@ export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({
diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js
index bfa1204e..0294e9c4 100644
--- a/src/api/PurchasingCenter/PurchaseContractSearch.js
+++ b/src/api/PurchasingCenter/PurchaseContractSearch.js
@@ -59,8 +59,6 @@ export function deleteContract(num) {
     }
   })
 }
-<<<<<<< HEAD
-=======
 // 删除采购合同
 export function handleDone(num) {
   return request({
@@ -72,4 +70,3 @@ export function handleDone(num) {
     }
   })
 }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
index 9f42f827..7f18ca88 100644
--- a/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
+++ b/src/api/WorkshopProcurement/InvoiceSettlementApplication1.js
@@ -1,7 +1,5 @@
 import request from '@/utils/request'
 
-<<<<<<< HEAD
-=======
 export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
   return request({
     url: '',
@@ -14,7 +12,6 @@ export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
   })
 }
 
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 050c45e2..58dca557 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -37,24 +37,15 @@ export default {
 }
 </script>
 
-<<<<<<< HEAD
 <style rel="stylesheet/scss" lang="scss">
-=======
-<style rel="stylesheet/scss" lang="scss" scoped>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   .app-breadcrumb.el-breadcrumb {
     display: inline-block;
     font-size: 14px;
     line-height: 50px;
     margin-left: 10px;
-<<<<<<< HEAD
     color: #fff;
     .no-redirect {
       color: #fff;
-=======
-    .no-redirect {
-      color: #97a8be;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       cursor: text;
     }
   }
diff --git a/src/main.js b/src/main.js
index 969b721f..907a2a14 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,10 +21,8 @@ import Viewer from 'v-viewer'
 import 'viewerjs/dist/viewer.css'
 import VueBarcode from '@xkeshi/vue-barcode'
 import Direction from 'vue-direction-key'
-
 import elDragDialog from '@/directive/el-dragDialog'
 Vue.use(elDragDialog)
-
 Vue.component('barcode', VueBarcode)
 Vue.use(Direction)
 Vue.use(curd)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index f3e9525b..cc10a203 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -28,7 +28,6 @@
   }
 }
  .el-table th{
-<<<<<<< HEAD
    background-color: #7eaced;
    color: white;/*修改表格头部背景*/
    line-height: 3em!important;
@@ -51,40 +50,20 @@
  }
  .el-table td, .is-leaf{
    background-color: rgb(255, 255, 255);
-=======
-   background-color: rgb(98, 157, 209);
-   color: white;
- }
- .el-tree-node__content>.el-tree-node__expand-icon{
-   display: none;
- }
- .el-table td, .is-leaf{
-   background-color: rgb(213, 230, 347);
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    color: black;
    font-weight:400
  }
  .el-table--striped .el-table__body tr.el-table__row--striped td{
-<<<<<<< HEAD
    background-color: #d8dde6;/*修改斑马线表格背景*/
-=======
-   background-color: rgb(255, 255, 255);
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  }
  .el-table thead.is-group th{
    background-color: rgb(98, 157, 209);
  }
-<<<<<<< HEAD
 
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
  .el-textarea__inner,
  .el-radio__inner,
  .el-input__inner{
    border: 1px solid rgb(49, 56, 72)!important;
  }
-<<<<<<< HEAD
 
 
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/styles/index.scss b/src/styles/index.scss
index cf93fc3e..eb7eb436 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -24,11 +24,7 @@ html {
 #app{
   height: 100%;
   .sidebar-container{
-<<<<<<< HEAD
     background-color: #152c7c;
-=======
-    background-color: #2e296a;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 }
 
@@ -103,18 +99,13 @@ el-form-item__content{
 .el-menu-item, .el-submenu__title{
   line-height: 42px;
   height: 42px;
-<<<<<<< HEAD
   //background-color: #2e296a!important;
-=======
-  background-color: #2e296a!important;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 .el-scrollbar{
   height: 100%;
 }
 
 .el-submenu__title{
-<<<<<<< HEAD
   //background-color: #2e296a!important;
 }
 .el-card__body{
@@ -175,7 +166,4 @@ el-card{
     background: #ff9759;
     border-color: #ff9759;
   }
-=======
-  background-color: #2e296a!important;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 5bf843ec..fab46e1b 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -45,11 +45,7 @@
     .el-menu {
       border: none;
       height: 100%;
-<<<<<<< HEAD
       background: #152c7c!important;
-=======
-      background: #2e296a!important;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       width: 100% !important;
     }
   }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 90ef5309..6d34f21e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,10 +1,4 @@
 //sidebar
-<<<<<<< HEAD
 $menuBg:#152c7c;
 $subMenuBg:rgb(29,53,149);
 $menuHover:rgb(40,114,199);
-=======
-$menuBg:#304156;
-$subMenuBg:#3d3780;
-$menuHover:#9892E4;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/utils/request.js b/src/utils/request.js
index 59bcef91..327c917c 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,11 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-<<<<<<< HEAD
   baseURL: `http://123.56.95.229:8023/submit/MESCommonBase.ashx`,
-=======
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index f0bc4e79..1511ee1f 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -4,24 +4,14 @@
       <el-col :span="6">
         <el-card>
           <span>工艺分类：</span>
-<<<<<<< HEAD
           <el-button type="primary" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
           <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" @click="editProcessClassification()">编辑</el-button>
           <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
-=======
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
-          <el-button size="small" type="warning" icon="el-icon-edit" @click="editProcessClassification()">编辑</el-button>
-          <el-button size="small" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-card>
       </el-col>
       <el-col :span="18">
         <el-card>
-<<<<<<< HEAD
           <el-button type="primary" plain style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
-=======
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-card>
       </el-col>
     </el-row>
@@ -32,7 +22,6 @@
             v-loading="loading1"
             ref="multipleTable"
             :data="tableData1"
-<<<<<<< HEAD
             size="mini"
             highlight-current-row
             stripe
@@ -40,12 +29,6 @@
             tooltip-effect="dark"
             style="width: 100%"
             height="800">
-=======
-            stripe
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="700">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <el-table-column align="center" label=" " width="50px">
               <template slot-scope="scope">
                 <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
@@ -67,7 +50,6 @@
           <el-table
             :data="tableData2"
             :row-key="getRowKeys"
-<<<<<<< HEAD
             :row-style="abc"
             :expand-row-keys="expands"
             size="mini"
@@ -81,21 +63,10 @@
               <template slot-scope="scope">
                 <el-table :data="tableData3" border stripe style="width: 40%">
                   <el-table-column label="工艺要求" align="center">
-=======
-            :expand-row-keys="expands"
-            height="700"
-            width="100%"
-            @expand-change="searchTechnologicalRequirementsOfProcessNum">
-            <el-table-column type="expand">
-              <template slot-scope="scope">
-                <el-table :data="tableData3" border>
-                  <el-table-column label="工艺要求">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                     <template slot-scope="scope">
                       {{ scope.row.工艺要求 }}
                     </template>
                   </el-table-column>
-<<<<<<< HEAD
                   <el-table-column label="操作" align="center" >
                     <template slot-scope="scope">
                       <el-tooltip effect="dark" content="编辑" placement="top">
@@ -117,66 +88,34 @@
                             @click="delTechnologicalRequirements(scope.row)"/>
                         </div>
                       </el-tooltip>
-=======
-                  <el-table-column label="操作" fixed="right" width="200px">
-                    <template slot-scope="scope">
-                      <el-button
-                        size="mini"
-                        type="warning"
-                        icon="el-icon-edit"
-                        @click="editTechnologicalRequirements(scope.row)">编辑</el-button>
-                      <el-button
-                        size="mini"
-                        type="danger"
-                        icon="el-icon-delete"
-                        @click="delTechnologicalRequirements(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                     </template>
                   </el-table-column>
                 </el-table>
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="工艺名称" width="200">
-=======
-            <el-table-column label="工艺名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column align="center" label="操作" >
-=======
-            <el-table-column>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 <el-button
                   size="mini"
                   type="warning"
-<<<<<<< HEAD
                   icon="el-icon-edit-outline"
                   plain
-=======
-                  icon="el-icon-edit"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   @click="editProcess(scope.row)">编辑工艺</el-button>
                 <el-button
                   size="mini"
                   type="danger"
-<<<<<<< HEAD
                   plain
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   icon="el-icon-delete"
                   @click="delProcess(scope.row)">删除工艺</el-button>
                 <el-button
                   size="mini"
                   type="primary"
-<<<<<<< HEAD
                   plain
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   icon="el-icon-circle-plus-outline"
                   @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>
               </template>
@@ -185,11 +124,7 @@
         </el-card>
       </el-col>
     </el-row>
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible1" title="新增工艺分类" center style="min-height: 300px" width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible1" title="增加工艺分类" center style="min-height: 300px" width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
         <el-form-item label="工艺分类" prop="ProcessClassification">
           <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
@@ -213,11 +148,7 @@
       </div>
     </el-dialog>
 
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible3" title="增加工艺" center style="min-height: 300px" width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
         <el-form-item label="工艺名称" prop="Process">
           <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
@@ -328,14 +259,11 @@ export default {
     this.searchProcessClassification()
   },
   methods: {
-<<<<<<< HEAD
     abc() {
       return {
         height: '35px'
       }
     },
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     searchProcessClassification() {
       this.loading1 = true
       searchProcessClassification().then(response => {
@@ -656,16 +584,9 @@ export default {
 </script>
 
 <style scoped>
-<<<<<<< HEAD
   /*.el-card {*/
   /*  margin-top: 15px;*/
   /*  margin-left: 15px;*/
  /* }!**!*/
-=======
-  .el-card {
-    margin-top: 15px;
-    margin-left: 15px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 </style>
diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 3cf89429..d5dd4fca 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/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 = ''
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index 3b6085bf..9dd45d1f 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/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 {
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 4f348809..7701df71 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -12,156 +12,14 @@
         placeholder="请输入内容"
         @clear="clearMachine"
         @select="handleSelect"/>
-<<<<<<< HEAD
-        <!--<el-button type="success" icon="el-icon-search" size="mini" style="margin-left: 15px" @click="searchColor">查询</el-button>-->
-=======
       <el-tag style="margin-left: 10px; color: black" type="info">未开始</el-tag>
       <el-tag style="background: orange; color: black">进行中</el-tag>
       <el-tag style="background: lightgreen; color: black">已完成</el-tag>
       <el-tag style="background: red; color: black">已拖期</el-tag>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
     <el-card>
       <div class="main">
         <div class="process">
-<<<<<<< HEAD
-          <div :class="color[22]" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">发货</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[21]" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">总装调试</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[20]" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">装配质检</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[19]" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv6">电气装配</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[18]" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv5">机械装配</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[17]" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv7">冷作</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[16]" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv8">油漆</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[15]" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv9">成组配套</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[14]" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv12">自制质检</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[13]" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">采购质检</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[12]" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv10">车间加工</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[11]" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">工序外协</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[10]" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">能力平衡</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[9]" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">定额</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[8]" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">工艺</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[7]" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv11">自家备料</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[0]" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv1">签订合同</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[1]" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv2">产品设计</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[6]" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">外购备料</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[2]" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv3">零件分配</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[3]" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
-              <el-button :disabled="disabled" type="text" @click="searchDiv4">自制件</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[5]" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">车间采购</el-button>
-            </el-tooltip>
-          </div>
-          <div :class="color[4]" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
-            <el-tooltip placement="top">
-              <div slot="content">多行信息<br>第二行信息</div>
-              <el-button :disabled="disabled" type="text" @click="aaa">采购部采购</el-button>
-=======
           <div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
@@ -298,7 +156,6 @@
             <el-tooltip placement="top">
               <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
               <el-button :disabled="disabled" type="text" style="color: black" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             </el-tooltip>
           </div>
         </div>
@@ -364,15 +221,9 @@
                   {{ dataDiv1.付款方式 }}
                 </div>
                 <div style="margin-top: 17px">
-<<<<<<< HEAD
-                  <sapn>回款进度：</sapn>
-                  <div style="width: 200px;display: inline-block">
-                    <el-progress :text-inside="true" :stroke-width="15" :percentage="dataDiv1.付款百分比"/>
-=======
                   <span>回款进度：</span>
                   <div style="width: 200px;display: inline-block">
                     <el-progress :text-inside="true" :stroke-width="15" :percentage="parseInt(dataDiv1.付款百分比)"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </div>
                 </div>
               </div>
@@ -394,11 +245,7 @@
                   {{ dataDiv1.电话 }}
                 </div>
                 <div style="margin-top: 17px">
-<<<<<<< HEAD
-                  <sapn>客户评级：</sapn>
-=======
                   <span>客户评级：</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   <el-rate
                     :max="maxDiv1"
                     v-model="valueDiv1"
@@ -507,12 +354,8 @@
                 style="width: 100%;min-height: 300px;"
                 size="mini"
                 highlight-current-row
-<<<<<<< HEAD
-                border>
-=======
                 border
                 @row-click="turnToPartAs">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <el-table-column
                   label="序号"
                   align="center"
@@ -527,11 +370,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="分配进度">
                   <template slot-scope="scope">
-<<<<<<< HEAD
-                    <el-progress :text-inside="true" :stroke-width="15" :percentage="percent(scope.row)"/>
-=======
                     <el-progress :text-inside="true" :stroke-width="15" :percentage="parseInt(percent(scope.row))"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="组号">
@@ -591,12 +430,8 @@
                 style="width: 100%;min-height: 300px;"
                 size="mini"
                 highlight-current-row
-<<<<<<< HEAD
-                border>
-=======
                 border
                 @row-click="turnIniPro">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <el-table-column
                   label="序号"
                   align="center"
@@ -679,11 +514,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="组件名称">
                   <template slot-scope="scope">
-<<<<<<< HEAD
-                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
-=======
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="计划工时">
@@ -751,11 +582,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="组件名称">
                   <template slot-scope="scope">
-<<<<<<< HEAD
-                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
-=======
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="计划工时">
@@ -823,11 +650,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="组件名称">
                   <template slot-scope="scope">
-<<<<<<< HEAD
-                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
-=======
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="计划工时">
@@ -895,11 +718,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="组件名称">
                   <template slot-scope="scope">
-<<<<<<< HEAD
-                    {{ scope.row.组件名称 ? scope.row.组件名称 : '--' }}
-=======
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                   </template>
                 </el-table-column>
                 <el-table-column align="center" label="计划工时">
@@ -1084,12 +903,8 @@
                 style="width: 100%"
                 size="mini"
                 highlight-current-row
-<<<<<<< HEAD
-                border>
-=======
                 border
                 @row-click="turnToProStatus">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <el-table-column
                   label="序号"
                   align="center"
@@ -1154,12 +969,8 @@
                 style="width: 100%"
                 size="mini"
                 highlight-current-row
-<<<<<<< HEAD
-                border>
-=======
                 border
                 @row-click="turnMaterArrMan">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <el-table-column
                   label="序号"
                   align="center"
@@ -1201,16 +1012,7 @@
     <div v-show="showDiv12">
       <el-card class="showDiv">
         <el-row>
-<<<<<<< HEAD
-          <el-col :span="8">
-            <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
-              <!--<div id="barDiv11" style="width:600px;height:350px; display: block; float: left"/>-->
-            </div>
-          </el-col>
-          <el-col :span="16">
-=======
           <el-col :span="24">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
                 :data="tableDataDiv12"
@@ -1260,272 +1062,6 @@
         </el-row>
       </el-card>
     </div>
-<<<<<<< HEAD
-  </div>
-</template>
-
-<script>
-import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
-import request from '@/utils/request'
-import echarts from 'echarts'
-export default {
-  data() {
-    return {
-      color: [],
-      disabled: true,
-      machineValue: '', // 机床流水号
-      searchCriteria: '', // 机床名称 V-model
-      restaurants: [], // 机床名称数组
-      showDiv0: true,
-      showDiv1: false,
-      showDiv2: false,
-      showDiv3: false,
-      showDiv4: false,
-      showDiv5: false,
-      showDiv6: false,
-      showDiv7: false,
-      showDiv8: false,
-      showDiv9: false,
-      showDiv10: false,
-      showDiv11: false,
-      showDiv12: false,
-      valueDiv1: null, // div1 客户评级
-      maxDiv1: 6, // div1 客户评级最大值
-      tableDataDiv2: [],
-      tableDataDiv3: [],
-      tableDataDiv4: [],
-      tableDataDiv5: [],
-      tableDataDiv6: [],
-      tableDataDiv7: [],
-      tableDataDiv8: [],
-      tableDataDiv9A: [],
-      tableDataDiv9B: [],
-      tableDataDiv9C: [],
-      tableDataDiv10: [],
-      tableDataDiv11: [],
-      tableDataDiv12: [],
-      dataDiv1: {
-        付款方式: '无数据',
-        付款方式代码: '无数据',
-        价值评估: '无数据',
-        价值评估流水号: '无数据',
-        发货节点: '无数据',
-        合同总金额: '无数据',
-        合同签订日期: '无数据',
-        合同编号: '无数据',
-        姓名: '无数据',
-        客户名称: '无数据',
-        已支付: '无数据',
-        电话: '无数据',
-        联系人: '无数据',
-        营销经理流水号: '无数据',
-        项目名称: '无数据',
-        项目流水号: '无数据',
-        付款百分比: 0
-      },
-      dataDiv2: {
-        组件总数: '',
-        整改组数: '',
-        data: []
-      },
-      dataDiv3: {
-        xData: [],
-        yDataA: [],
-        yDataB: []
-      },
-      dataDiv4: {
-        xData: [],
-        yDataA: [],
-        yDataB: []
-      },
-      dataDiv5: {
-        data1: null,
-        data2: null,
-        data3: null,
-        data4: [],
-        length: null
-      },
-      dataDiv6: {
-        data1: null,
-        data2: null,
-        data3: null,
-        data4: [],
-        length: null
-      },
-      dataDiv7: {
-        data1: null,
-        data2: null,
-        data3: null,
-        data4: [],
-        length: null
-      },
-      dataDiv8: {
-        data1: null,
-        data2: null,
-        data3: null,
-        data4: [],
-        length: null
-      },
-      dataDiv10: {
-        data: []
-      },
-      dataDiv11: {
-        xData: [],
-        yDataA: [],
-        yDataB: []
-      }
-    }
-  },
-  created() {
-    this.color[0] = 'white'
-    this.color[1] = 'white'
-    this.color[2] = 'white'
-    this.color[3] = 'white'
-    this.color[4] = 'white'
-    this.color[5] = 'white'
-    this.color[6] = 'white'
-    this.color[7] = 'white'
-    this.color[8] = 'white'
-    this.color[9] = 'white'
-    this.color[10] = 'white'
-    this.color[11] = 'white'
-    this.color[12] = 'white'
-    this.color[13] = 'white'
-    this.color[14] = 'white'
-    this.color[15] = 'white'
-    this.color[16] = 'white'
-    this.color[17] = 'white'
-    this.color[18] = 'white'
-    this.color[19] = 'white'
-    this.color[20] = 'white'
-    this.color[21] = 'white'
-    this.color[22] = 'white'
-  },
-  methods: {
-    changeScroll1() {
-      const div1 = document.getElementById('div1')
-      const div2 = document.getElementById('div2')
-      const div3 = document.getElementById('div3')
-      div2.removeAttribute('onscroll')
-      div3.removeAttribute('onscroll')
-      div1.setAttribute('onscroll', 'document.getElementById(\'div2\').scrollTop = scrollTop;document.getElementById(\'div3\').scrollTop = scrollTop')
-    },
-    changeScroll2() {
-      const div1 = document.getElementById('div1')
-      const div2 = document.getElementById('div2')
-      const div3 = document.getElementById('div3')
-      div1.removeAttribute('onscroll')
-      div3.removeAttribute('onscroll')
-      div2.setAttribute('onscroll', 'document.getElementById(\'div1\').scrollTop = scrollTop;document.getElementById(\'div3\').scrollTop = scrollTop')
-    },
-    changeScroll3() {
-      const div1 = document.getElementById('div1')
-      const div2 = document.getElementById('div2')
-      const div3 = document.getElementById('div3')
-      div2.removeAttribute('onscroll')
-      div1.removeAttribute('onscroll')
-      div3.setAttribute('onscroll', 'document.getElementById(\'div2\').scrollTop = scrollTop;document.getElementById(\'div1\').scrollTop = scrollTop')
-    },
-    // 百分数转换
-    percent(row) {
-      const a = parseInt(row.总个数) - parseInt(row.总未分配个数)
-      const b = parseInt(row.总个数)
-      return b !== 0 ? (a / b * 100).toFixed(2) : 0
-    },
-    // 清空查询条件
-    clearMachine() {
-      this.machineValue = ''
-      this.disabled = true
-      this.showDiv0 = true
-      this.showDiv1 = false
-      this.showDiv2 = false
-      this.showDiv3 = false
-      this.showDiv4 = false
-      this.showDiv5 = false
-      this.showDiv6 = false
-      this.showDiv7 = false
-      this.showDiv8 = false
-      this.showDiv9 = false
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-    },
-    // 机床名称查询函数
-    querySearch(queryString, cb) {
-      this.restaurants = []
-      if (this.searchCriteria !== '' && this.searchCriteria !== null) {
-        SelectMachine(this.searchCriteria).then(response => {
-          const res = response.data
-          res.forEach(item => {
-            this.restaurants.push({
-              value: item.货品编号,
-              num: item.机床流水号
-            })
-          })
-          return this.restaurants
-        }).then(data => {
-          var restaurants = data
-          var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
-          return results
-        }).then(data => {
-          // 调用 callback 返回建议列表的数据
-          cb(data)
-        })
-      }
-    },
-    // 机床名称实时请求查询匹配函数
-    createFilter(queryString) {
-      return (restaurant) => {
-        return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
-        // !== -1为全字匹配  === 0为首字匹配
-      }
-    },
-    // 选择机床名称后的赋值函数
-    handleSelect(item) {
-      // 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
-      console.log(item)
-      this.machineValue = item.num
-      console.log(this.machineValue, 111)
-      this.machineValue ? this.disabled = false : this.disabled = true
-      console.log(this.disabled, 222)
-      this.showDiv1 = false
-      this.showDiv2 = false
-      this.showDiv3 = false
-      this.showDiv4 = false
-      this.showDiv5 = false
-      this.showDiv6 = false
-      this.showDiv7 = false
-      this.showDiv8 = false
-      this.showDiv9 = false
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-      this.showDiv0 = true
-    },
-    // 查询签订合同div数据
-    async searchDiv1() {
-      this.showDiv0 = false
-      this.showDiv1 = true
-      this.showDiv2 = false
-      this.showDiv3 = false
-      this.showDiv4 = false
-      this.showDiv5 = false
-      this.showDiv6 = false
-      this.showDiv7 = false
-      this.showDiv8 = false
-      this.showDiv9 = false
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-      await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select 项目流水号 from PDM_机床名称 where 机床流水号 = ${this.machineValue}`
-        }
-      }).then(res => {
-=======
     <!--工艺-->
     <div v-show="showDiv13">
       <el-card class="showDiv">
@@ -3234,50 +2770,11 @@ export default {
       }).then(res => {
         this.tableDataDiv6 = res.data
         this.dataDiv6.length = res.data.length
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         request({
           url: '',
           method: 'post',
           data: {
             type: '3',
-<<<<<<< HEAD
-            name: `select * from 综合查询_签订合同模块信息视图 where 项目流水号 = ${res.data[0].项目流水号}`
-          }
-        }).then(res => {
-          this.dataDiv1.付款方式 = res.data[0].付款方式
-          this.dataDiv1.付款方式代码 = res.data[0].付款方式代码
-          this.dataDiv1.价值评估 = res.data[0].价值评估
-          this.dataDiv1.价值评估流水号 = res.data[0].价值评估流水号
-          this.dataDiv1.发货节点 = res.data[0].发货节点
-          res.data[0].合同总金额 !== '' && res.data[0].合同总金额 !== null ? this.dataDiv1.合同总金额 = res.data[0].合同总金额 + '万元' : this.dataDiv1.合同总金额 = '无数据'
-          this.dataDiv1.合同签订日期 = res.data[0].合同签订日期
-          this.dataDiv1.合同编号 = res.data[0].合同编号
-          this.dataDiv1.姓名 = res.data[0].姓名
-          this.dataDiv1.客户名称 = res.data[0].客户名称
-          res.data[0].已支付 !== '' && res.data[0].已支付 !== null ? this.dataDiv1.已支付 = res.data[0].已支付 + '万元' : this.dataDiv1.已支付 = '无数据'
-          res.data[0].电话 !== '' && res.data[0].电话 !== null ? this.dataDiv1.电话 = res.data[0].电话 : this.dataDiv1.电话 = '无数据'
-          this.dataDiv1.联系人 = res.data[0].联系人
-          this.dataDiv1.营销经理流水号 = res.data[0].营销经理流水号
-          this.dataDiv1.项目名称 = res.data[0].项目名称
-          this.dataDiv1.项目流水号 = res.data[0].项目流水号
-          res.data[0].付款百分比 !== '' && res.data[0].付款百分比 !== null ? this.dataDiv1.付款百分比 = res.data[0].付款百分比 : this.dataDiv1.付款百分比 = 0
-          if (res.data[0].价值评估 === '高') {
-            this.valueDiv1 = 6
-          } else if (res.data[0].价值评估 === '高') {
-            this.valueDiv1 = 3
-          } else {
-            this.valueDiv1 = 1
-          }
-        })
-      })
-    },
-    // 查询产品设计div数据
-    async searchDiv2() {
-      this.dataDiv2.data = []
-      this.showDiv0 = false
-      this.showDiv1 = false
-      this.showDiv2 = true
-=======
             name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
           }
         }).then(res => {
@@ -3355,23 +2852,16 @@ export default {
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv3 = false
       this.showDiv4 = false
       this.showDiv5 = false
       this.showDiv6 = false
-<<<<<<< HEAD
-      this.showDiv7 = false
-=======
       this.showDiv7 = true
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv8 = false
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
       this.showDiv12 = false
-<<<<<<< HEAD
-=======
       this.showDiv13 = false
       this.showDiv14 = false
       this.showDiv15 = false
@@ -3384,35 +2874,21 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.dataDiv7.data4 = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue},@计划类型 = 1`
-        }
-      }).then(res => {
-        this.tableDataDiv2 = res.data
-=======
           name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 3 `
         }
       }).then(res => {
         this.tableDataDiv7 = res.data
         this.dataDiv7.length = res.data.length
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         request({
           url: '',
           method: 'post',
           data: {
             type: '3',
-<<<<<<< HEAD
-            name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue}`
-          }
-        }).then(res => {
-          this.dataDiv2.组件总数 = res.data[0].Column1
-=======
             name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
           }
         }).then(res => {
@@ -3424,47 +2900,11 @@ export default {
             })
           }
         }).then(() => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           request({
             url: '',
             method: 'post',
             data: {
               type: '3',
-<<<<<<< HEAD
-              name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue} and 组号 like '9%'`
-            }
-          }).then(res => {
-            this.dataDiv2.整改组数 = res.data[0].Column1
-            request({
-              url: '',
-              method: 'post',
-              data: {
-                type: '3',
-                name: `select count(*) from 项目计划管理_组件计划_视图 where 机床流水号 = ${this.machineValue} and 计划类型 = 1 and 实际完成时间 is not null`
-              }
-            }).then(res => {
-              if (parseInt(this.dataDiv2.整改组数) !== 0) {
-                this.dataDiv2.data.push({
-                  value: this.dataDiv2.整改组数,
-                  name: '整改组件'
-                })
-              }
-              if (parseInt(res.data[0].Column1) !== 0) {
-                this.dataDiv2.data.push({
-                  value: res.data[0].Column1,
-                  name: '已完成组件'
-                })
-              }
-              if (parseInt(this.dataDiv2.组件总数) - parseInt(this.dataDiv2.整改组数) - parseInt(res.data[0].Column1) !== 0) {
-                this.dataDiv2.data.push({
-                  value: parseInt(this.dataDiv2.组件总数) - parseInt(this.dataDiv2.整改组数) - parseInt(res.data[0].Column1),
-                  name: '未完成组件'
-                })
-              }
-            }).then(() => {
-              this.drawLineDiv2()
-            })
-=======
               name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
             }
           }).then(res => {
@@ -3485,47 +2925,19 @@ export default {
               })
             }
             this.drawLineDiv7()
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           })
         })
       })
     },
-<<<<<<< HEAD
-    // 绘制品设计饼状图
-    drawLineDiv2() {
-      const bar = echarts.init(document.getElementById('barDiv1'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        // title : {
-        //   text: '某站点用户访问来源',
-        //   subtext: '纯属虚构',
-        //   x:'center'
-        // },
-=======
     // 绘制冷作div饼图
     drawLineDiv7() {
       const bar = echarts.init(document.getElementById('barDiv7'))
       // 指定图表的配置项和数据
       bar.setOption({
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         tooltip: {
           trigger: 'item',
           formatter: '{a} <br/>{b} : {c} ({d}%)'
         },
-<<<<<<< HEAD
-        // legend: {
-        //   orient: 'vertical',
-        //   left: 'left',
-        //   data: ['直接访问','邮件营销','联盟广告','视频广告','搜索引擎']
-        // },
-        series: [
-          {
-            name: '组件类型比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '40%'],
-            data: this.dataDiv2.data,
-=======
         legend: {
           orient: 'vertical',
           left: 'left',
@@ -3538,7 +2950,6 @@ export default {
             radius: '55%',
             center: ['50%', '45%'],
             data: this.dataDiv7.data4,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             itemStyle: {
               emphasis: {
                 shadowBlur: 10,
@@ -3550,39 +2961,21 @@ export default {
         ]
       })
     },
-<<<<<<< HEAD
-    // 查询零件分配div数据
-    async searchDiv3() {
-      this.showDiv0 = false
-      this.showDiv1 = false
-      this.showDiv2 = false
-      this.showDiv3 = true
-=======
     // 查询油漆div数据
     async searchDiv8() {
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
       this.showDiv3 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv4 = false
       this.showDiv5 = false
       this.showDiv6 = false
       this.showDiv7 = false
-<<<<<<< HEAD
-      this.showDiv8 = false
-=======
       this.showDiv8 = true
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
       this.showDiv12 = false
-<<<<<<< HEAD
-      this.dataDiv3.yDataB = []
-      this.dataDiv3.yDataA = []
-      this.dataDiv3.xData = []
-=======
       this.showDiv13 = false
       this.showDiv14 = false
       this.showDiv15 = false
@@ -3595,70 +2988,11 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.dataDiv8.data4 = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `select 综合查询_零件分配模块信息视图.*
-                ,isnull(基本件个数,0) as 基本件个数
-                ,isnull(外购件个数,0) as 外购件个数
-                ,(isnull(基本件个数,0) + isnull(外购件个数,0)) as 总个数
-                ,isnull(基本件未分配个数,0) as 基本件未分配个数
-                ,isnull(外购件未分配个数,0) as 外购件未分配个数
-                ,(isnull(基本件未分配个数,0) + isnull(外购件未分配个数,0)) as 总未分配个数
-                from 综合查询_零件分配模块信息视图
-                left join (select 组件流水号,count(*) as 基本件个数
-                from PDM_零件明细表_基本件 group by 组件流水号) as a on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号
-                left join (select 组件流水号,count(*) as 外购件个数
-                from PDM_零件明细表_标准件和外购件 group by 组件流水号) as b on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
-                left join (select 组件流水号,count(*) as 基本件未分配个数
-                from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 0 group by 组件流水号) as c on 综合查询_零件分配模块信息视图.组件流水号 = c.组件流水号
-                left join (select 组件流水号,count(*) as 外购件未分配个数
-                from PDM_零件明细表_标准件和外购件 where 是否车间采购 = 0 group by 组件流水号) as d on 综合查询_零件分配模块信息视图.组件流水号 = d.组件流水号
-                where 机床流水号 = ${this.machineValue} and 组号 <> '00组' order by 组号`
-        }
-      }).then(res => {
-        this.tableDataDiv3 = res.data
-        for (let i = 0; i < res.data.length; i++) {
-          this.dataDiv3.xData.push(res.data[i].组号)
-          this.dataDiv3.yDataA.push(res.data[i].总个数)
-          this.dataDiv3.yDataB.push(parseInt(res.data[i].总个数) - parseInt(res.data[i].总未分配个数))
-        }
-        this.drawLineDiv3()
-      })
-    },
-    // 绘制零件分配条形图
-    drawLineDiv3() {
-      const bar = echarts.init(document.getElementById('barDiv3'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {},
-        legend: {
-          data: ['零件总条数', '已分配条数']
-        },
-        xAxis: {
-          data: this.dataDiv3.xData,
-          show: true
-        },
-        yAxis: {},
-        series: [{
-          name: '零件总条数',
-          type: 'bar',
-          data: this.dataDiv3.yDataA
-        },
-        {
-          name: '已分配条数',
-          type: 'bar',
-          data: this.dataDiv3.yDataB
-        }]
-      })
-    },
-    // 查询自制件div数据
-    async searchDiv4() {
-=======
           name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 4 `
         }
       }).then(res => {
@@ -3743,30 +3077,15 @@ export default {
     },
     // 查询成组配套div数据
     async searchDiv9() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
       this.showDiv3 = false
-<<<<<<< HEAD
-      this.showDiv4 = true
-=======
       this.showDiv4 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv5 = false
       this.showDiv6 = false
       this.showDiv7 = false
       this.showDiv8 = false
-<<<<<<< HEAD
-      this.showDiv9 = false
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-      this.tableDataDiv4 = []
-      this.dataDiv4.xData = []
-      this.dataDiv4.yDataB = []
-      this.dataDiv4.yDataA = []
-=======
       this.showDiv9 = true
       this.showDiv10 = false
       this.showDiv11 = false
@@ -3782,81 +3101,11 @@ export default {
       this.showDiv20 = false
       this.showDiv21 = false
       this.showDiv22 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `select 综合查询_零件分配模块信息视图.*,
-                  isnull(自家加工件总条数,0) as 自家加工件总条数
-                  ,isnull(已传递条数,0) as 已传递条数
-                  from 综合查询_零件分配模块信息视图
-                  left join (select 组件流水号,COUNT(*) as 自家加工件总条数
-                  from 车间生产管理工艺_零件工序_投产信息_查询视图 group by 组件流水号) as a
-                  on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号
-                  left join (select 组件流水号,count(*) as 已传递条数
-                  from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b
-                  on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
-                  where 机床流水号 = ${this.machineValue} order by 组号`
-        }
-      }).then(res => {
-        this.tableDataDiv4 = res.data
-        for (let i = 0; i < res.data.length; i++) {
-          this.dataDiv4.xData.push(res.data[i].组号)
-          this.dataDiv4.yDataA.push(res.data[i].自家加工件总条数)
-          this.dataDiv4.yDataB.push(res.data[i].已传递条数)
-        }
-        this.drawLineDiv4Bar()
-      })
-    },
-    // 绘制自制件div条形图
-    drawLineDiv4Bar() {
-      const bar = echarts.init(document.getElementById('barDiv4'))
-      this.tableData = [50, 15, 20, 30, 45, 46]
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'axis',
-          axisPointer: {
-            type: 'shadow'
-          }
-        },
-        legend: {
-          data: ['总条数', '已投产']
-        },
-        grid: {
-          left: '3%',
-          right: '4%',
-          bottom: '3%',
-          containLabel: true
-        },
-        yAxis: {
-          type: 'value',
-          boundaryGap: [0, 0.01]
-        },
-        xAxis: {
-          type: 'category',
-          data: this.dataDiv4.xData
-        },
-        series: [
-          {
-            name: '总条数',
-            type: 'bar',
-            data: this.dataDiv4.yDataA
-          },
-          {
-            name: '已投产',
-            type: 'bar',
-            data: this.dataDiv4.yDataB
-          }
-        ]
-      })
-    },
-    // 查询自制件div数据
-    async searchDiv5() {
-=======
           name: `select 前几列.*,case when 完成时间 = '未完成' then '未完成' else convert(nvarchar(50),入库时间,21) end as 完成时间
                 from (SELECT 组号 ,组件名称,SUM(isnull(批次数量,0))as 投产数量,SUM(isnull(入库数量,0))as 入库数量,MAX(入库时间) as 入库时间
                 from 车间生产管理工艺_零件工艺计划_传递后_视图
@@ -3926,27 +3175,16 @@ export default {
     },
     // 查询车间加工div数据
     async searchDiv10() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
       this.showDiv3 = false
       this.showDiv4 = false
-<<<<<<< HEAD
-      this.showDiv5 = true
-=======
       this.showDiv5 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv6 = false
       this.showDiv7 = false
       this.showDiv8 = false
       this.showDiv9 = false
-<<<<<<< HEAD
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-      this.dataDiv5.data4 = []
-=======
       this.showDiv10 = true
       this.showDiv11 = false
       this.showDiv12 = false
@@ -3962,45 +3200,20 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.dataDiv10.data = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `
-                select 综合查询_零件分配模块信息视图.* ,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 综合查询_零件分配模块信息视图
-                left join (select 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 车间管理_工作计划 where 计划类型 = 1 group by 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时) as a
-                on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号  where 机床流水号 = ${this.machineValue} and 组号 <> '00组'
-                order by 组号`
-        }
-      }).then(res => {
-        this.tableDataDiv5 = res.data
-        this.dataDiv5.length = res.data.length
-=======
           name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue}, @计划类型=4`
         }
       }).then(res => {
         this.tableDataDiv10 = res.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         request({
           url: '',
           method: 'post',
           data: {
             type: '3',
-<<<<<<< HEAD
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 1 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
-          }
-        }).then(res => {
-          this.dataDiv5.data1 = res.data[0].进行中
-          if (res.data[0].进行中 !== 0) {
-            this.dataDiv5.data4.push({
-              value: res.data[0].进行中,
-              name: '装配进行中'
-=======
             name: `select COUNT(*) as 未完成
                    from 项目计划管理_组件计划_视图
                    where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is null`
@@ -4010,7 +3223,6 @@ export default {
             this.dataDiv10.data.push({
               name: '未完成',
               value: res.data[0].未完成
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             })
           }
         }).then(() => {
@@ -4019,28 +3231,6 @@ export default {
             method: 'post',
             data: {
               type: '3',
-<<<<<<< HEAD
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 1 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
-            }
-          }).then(res => {
-            this.dataDiv5.data2 = res.data[0].已完成
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv5.data4.push({
-                value: res.data[0].已完成,
-                name: '装配已完成'
-              })
-            }
-          }).then(() => {
-            this.dataDiv5.data3 = parseInt(this.dataDiv5.length - this.dataDiv5.data1 - this.dataDiv5.data2)
-          }).then(() => {
-            if (parseInt(this.dataDiv5.data3) !== 0) {
-              this.dataDiv5.data4.push({
-                value: this.dataDiv5.data3,
-                name: '无计划/未开始'
-              })
-            }
-            this.drawLineDiv5()
-=======
               name: `select COUNT(*) as 已完成
                      from 项目计划管理_组件计划_视图
                      where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is not null`
@@ -4053,21 +3243,13 @@ export default {
               })
             }
             this.drawLineDiv10()
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           })
         })
       })
     },
-<<<<<<< HEAD
-    // 绘制机械装配div饼图
-    drawLineDiv5() {
-      const bar = echarts.init(document.getElementById('barDiv5'))
-      this.tableData = [50, 15, 20, 30, 45, 46]
-=======
     // 绘制油漆div饼图
     drawLineDiv10() {
       const bar = echarts.init(document.getElementById('barDiv10'))
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       // 指定图表的配置项和数据
       bar.setOption({
         tooltip: {
@@ -4077,11 +3259,7 @@ export default {
         legend: {
           orient: 'vertical',
           left: 'left',
-<<<<<<< HEAD
-          data: ['装配已完成', '装配进行中', '无计划/未开始']
-=======
           data: ['已完成', '未完成']
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         },
         series: [
           {
@@ -4089,11 +3267,7 @@ export default {
             type: 'pie',
             radius: '55%',
             center: ['50%', '45%'],
-<<<<<<< HEAD
-            data: this.dataDiv5.data4,
-=======
             data: this.dataDiv10.data,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             itemStyle: {
               emphasis: {
                 shadowBlur: 10,
@@ -4105,127 +3279,19 @@ export default {
         ]
       })
     },
-<<<<<<< HEAD
-    // 查询电气装配div数据
-    async searchDiv6() {
-=======
     // 查询自家备料div数据
     async searchDiv11() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
       this.showDiv3 = false
       this.showDiv4 = false
       this.showDiv5 = false
-<<<<<<< HEAD
-      this.showDiv6 = true
-=======
       this.showDiv6 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv7 = false
       this.showDiv8 = false
       this.showDiv9 = false
       this.showDiv10 = false
-<<<<<<< HEAD
-      this.showDiv11 = false
-      this.showDiv12 = false
-      this.dataDiv6.data4 = []
-      await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select 综合查询_零件分配模块信息视图.* ,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 综合查询_零件分配模块信息视图
-                left join (select 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 车间管理_工作计划 where 计划类型 = 2 group by 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时) as a
-                on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号  where 机床流水号 = ${this.machineValue} and 组号 <> '00组'
-                order by 组号`
-        }
-      }).then(res => {
-        this.tableDataDiv6 = res.data
-        this.dataDiv6.length = res.data.length
-        request({
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
-          }
-        }).then(res => {
-          this.dataDiv6.data1 = res.data[0].进行中
-          if (res.data[0].进行中 !== 0) {
-            this.dataDiv6.data4.push({
-              value: res.data[0].进行中,
-              name: '装配进行中'
-            })
-          }
-        }).then(() => {
-          request({
-            url: '',
-            method: 'post',
-            data: {
-              type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 2 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
-            }
-          }).then(res => {
-            this.dataDiv6.data2 = res.data[0].已完成
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv6.data4.push({
-                value: res.data[0].已完成,
-                name: '装配已完成'
-              })
-            }
-          }).then(() => {
-            this.dataDiv6.data3 = parseInt(this.dataDiv6.length - this.dataDiv6.data1 - this.dataDiv6.data2)
-          }).then(() => {
-            if (parseInt(this.dataDiv6.data3) !== 0) {
-              this.dataDiv6.data4.push({
-                value: this.dataDiv6.data3,
-                name: '无计划/未开始'
-              })
-            }
-            this.drawLineDiv6()
-          })
-        })
-      })
-    },
-    // 绘制电气装配div饼图
-    drawLineDiv6() {
-      const bar = echarts.init(document.getElementById('barDiv6'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
-          data: ['装配已完成', '装配进行中', '无计划/未开始']
-        },
-        series: [
-          {
-            name: '状态比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '45%'],
-            data: this.dataDiv6.data4,
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      })
-    },
-    // 查询冷作计划div数据
-    async searchDiv7() {
-=======
       this.showDiv11 = true
       this.showDiv12 = false
       this.showDiv13 = false
@@ -4406,7 +3472,6 @@ export default {
     },
     // 查询采购部采购div数据
     async searchDiv16() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -4414,19 +3479,12 @@ export default {
       this.showDiv4 = false
       this.showDiv5 = false
       this.showDiv6 = false
-<<<<<<< HEAD
-      this.showDiv7 = true
-=======
       this.showDiv7 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv8 = false
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
       this.showDiv12 = false
-<<<<<<< HEAD
-      this.dataDiv7.data4 = []
-=======
       this.showDiv13 = false
       this.showDiv14 = false
       this.showDiv15 = false
@@ -4438,25 +3496,11 @@ export default {
       this.showDiv20 = false
       this.showDiv21 = false
       this.showDiv22 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `select 综合查询_零件分配模块信息视图.* ,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 综合查询_零件分配模块信息视图
-                left join (select 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 车间管理_工作计划 where 计划类型 = 3 group by 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时) as a
-                on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号  where 机床流水号 = ${this.machineValue} and 组号 <> '00组'
-                order by 组号`
-        }
-      }).then(res => {
-        console.log(res, 8766)
-        this.tableDataDiv7 = res.data
-        this.dataDiv7.length = res.data.length
-=======
           name: `
             --外购件
             select 机床流水号,组号,组件名称
@@ -4486,25 +3530,11 @@ export default {
         }
       }).then(res => {
         this.tableDataDiv16A = res.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         request({
           url: '',
           method: 'post',
           data: {
             type: '3',
-<<<<<<< HEAD
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
-          }
-        }).then(res => {
-          this.dataDiv7.data1 = res.data[0].进行中
-          if (res.data[0].进行中 !== 0) {
-            this.dataDiv7.data4.push({
-              value: res.data[0].进行中,
-              name: '冷作进行中'
-            })
-          }
-        }).then(() => {
-=======
             name: `
               select 机床流水号,组号
                ,组件名称
@@ -4533,34 +3563,11 @@ export default {
           }
         }).then(res => {
           this.tableDataDiv16B = res.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           request({
             url: '',
             method: 'post',
             data: {
               type: '3',
-<<<<<<< HEAD
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
-            }
-          }).then(res => {
-            this.dataDiv7.data2 = res.data[0].已完成
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv7.data4.push({
-                value: res.data[0].已完成,
-                name: '冷作已完成'
-              })
-            }
-          }).then(() => {
-            this.dataDiv7.data3 = parseInt(this.dataDiv7.length - this.dataDiv7.data1 - this.dataDiv7.data2)
-          }).then(() => {
-            if (parseInt(this.dataDiv7.data3) !== 0) {
-              this.dataDiv7.data4.push({
-                value: this.dataDiv7.data3,
-                name: '无计划/未开始'
-              })
-            }
-            this.drawLineDiv7()
-=======
               name: `
                 select 机床流水号,组号,组件名称
                 ,SUM(基本件数) as 总基本件数
@@ -4586,50 +3593,12 @@ export default {
             }
           }).then(res => {
             this.tableDataDiv16C = res.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           })
         })
       })
     },
-<<<<<<< HEAD
-    // 绘制冷作div饼图
-    drawLineDiv7() {
-      const bar = echarts.init(document.getElementById('barDiv7'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
-          data: ['冷作已完成', '冷作进行中', '无计划/未开始']
-        },
-        series: [
-          {
-            name: '状态比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '45%'],
-            data: this.dataDiv7.data4,
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      })
-    },
-    // 查询油漆div数据
-    async searchDiv8() {
-=======
     // 查询车间采购div数据
     async searchDiv17() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -4638,18 +3607,11 @@ export default {
       this.showDiv5 = false
       this.showDiv6 = false
       this.showDiv7 = false
-<<<<<<< HEAD
-      this.showDiv8 = true
-=======
       this.showDiv8 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
       this.showDiv12 = false
-<<<<<<< HEAD
-      this.dataDiv8.data4 = []
-=======
       this.showDiv13 = false
       this.showDiv14 = false
       this.showDiv15 = false
@@ -4661,24 +3623,11 @@ export default {
       this.showDiv20 = false
       this.showDiv21 = false
       this.showDiv22 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `select 综合查询_零件分配模块信息视图.* ,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 综合查询_零件分配模块信息视图
-                left join (select 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时
-                from 车间管理_工作计划 where 计划类型 = 4 group by 组件流水号,计划工时,开始时间,结束时间,实际工时,修补工时) as a
-                on 综合查询_零件分配模块信息视图.组件流水号 = a.组件流水号  where 机床流水号 = ${this.machineValue} and 组号 <> '00组'
-                order by 组号`
-        }
-      }).then(res => {
-        this.tableDataDiv8 = res.data
-        this.dataDiv8.length = res.data.length
-=======
           name: `
             select 组号,组件名称
             ,SUM(基本件数) as 总基本件数
@@ -4695,88 +3644,11 @@ export default {
         }
       }).then(res => {
         this.tableDataDiv17A = res.data
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         request({
           url: '',
           method: 'post',
           data: {
             type: '3',
-<<<<<<< HEAD
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 4 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
-          }
-        }).then(res => {
-          this.dataDiv8.data1 = res.data[0].进行中
-          if (res.data[0].进行中 !== 0) {
-            this.dataDiv8.data4.push({
-              value: res.data[0].进行中,
-              name: '油漆进行中'
-            })
-          }
-        }).then(() => {
-          request({
-            url: '',
-            method: 'post',
-            data: {
-              type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 4 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
-            }
-          }).then(res => {
-            this.dataDiv8.data2 = res.data[0].已完成
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv8.data4.push({
-                value: res.data[0].已完成,
-                name: '油漆已完成'
-              })
-            }
-          }).then(() => {
-            this.dataDiv8.data3 = parseInt(this.dataDiv8.length - this.dataDiv8.data1 - this.dataDiv8.data2)
-          }).then(() => {
-            if (parseInt(this.dataDiv8.data3) !== 0) {
-              this.dataDiv8.data4.push({
-                value: this.dataDiv8.data3,
-                name: '无计划/未开始'
-              })
-            }
-            this.drawLineDiv8()
-          })
-        })
-      })
-    },
-    // 绘制油漆div饼图
-    drawLineDiv8() {
-      const bar = echarts.init(document.getElementById('barDiv8'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
-          data: ['油漆已完成', '油漆进行中', '无计划/未开始']
-        },
-        series: [
-          {
-            name: '状态比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '45%'],
-            data: this.dataDiv8.data4,
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      })
-    },
-    // 查询成组配套div数据
-    async searchDiv9() {
-=======
             name: `
               select 组号,组件名称
               ,SUM(基本件数) as 总基本件数
@@ -5012,7 +3884,6 @@ export default {
     },
     // 总装调试
     async searchDiv22() {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -5022,12 +3893,6 @@ export default {
       this.showDiv6 = false
       this.showDiv7 = false
       this.showDiv8 = false
-<<<<<<< HEAD
-      this.showDiv9 = true
-      this.showDiv10 = false
-      this.showDiv11 = false
-      this.showDiv12 = false
-=======
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
@@ -5046,84 +3911,11 @@ export default {
       // this.dataDiv11.yDataB = []
       // this.dataDiv11.yDataA = []
       // this.dataDiv11.xData = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `select 前几列.*,case when 完成时间 = '未完成' then '未完成' else convert(nvarchar(50),入库时间,21) end as 完成时间
-                from (SELECT 组号 ,组件名称,SUM(isnull(批次数量,0))as 投产数量,SUM(isnull(入库数量,0))as 入库数量,MAX(入库时间) as 入库时间
-                from 车间生产管理工艺_零件工艺计划_传递后_视图
-                where 机床流水号 = 89
-                group by 组号,组件名称) as 前几列
-                left join (SELECT 组号,'未完成' as 完成时间
-                from 车间生产管理工艺_零件工艺计划_传递后_视图
-                where 机床流水号 = ${this.machineValue} and isnull(入库数量,0) <> isnull(批次数量,0)
-                group by 组号) as 未完成组
-                on 前几列.组号 = 未完成组.组号`
-        }
-      }).then(res => {
-        this.tableDataDiv9A = res.data
-        request({
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select 组号,组件名称,sum(零件数量) as 总零件数量,SUM(已到货数量) as 总到货数量, (case when sum(零件数量) = SUM(已到货数量) then GETDATE() ELSE '' END)完成时间 from (
-                    SELECT [机床图号],[机床流水号],[组号] ,[组件名称] ,[组件流水号] ,[物料名称] as 零件名称 ,[物料型号] as 零件图号 ,[物料规格] ,[零件数量] ,通过的合同.已到货数量
-                     FROM MRP_计划订单_组件零件清单_标准件和外购件_视图
-                      left join (
-                      select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
-                     inner join 采购管理_采购合同_采购部 on 采购管理_采购合同明细_采购部.采购合同流水号 = 采购管理_采购合同_采购部.采购合同流水号
-                     where 采购管理_采购合同_采购部.是否未通过 = 0
-                     ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
-                     left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-                     WHERE  机床流水号 = N'${this.machineValue}'
-                     union
-                     SELECT [机床图号] ,[机床流水号] ,[组号] ,[组件名称] ,[组件流水号] ,[零件名称] ,[零件图号] ,规格 ,[零件数量] ,通过的合同.已到货数量
-                     FROM MRP_计划订单_组件零件清单_基本件_视图
-                     left join (
-                     select 采购管理_采购合同_采购部.*,组件零件基本件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
-                    inner join 采购管理_采购合同_采购部 on 采购管理_采购合同明细_采购部.采购合同流水号 = 采购管理_采购合同_采购部.采购合同流水号
-                    where 采购管理_采购合同_采购部.是否未通过 = 0
-                    ) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号
-                    left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-                    where 机床流水号 = '${this.machineValue}'
-                    ) as a
-                    where a.机床流水号 = '${this.machineValue}'
-                    group by a.组号,a.组件名称
-                    order by a.组号`
-          }
-        }).then(res => {
-          this.tableDataDiv9B = res.data
-          request({
-            url: '',
-            method: 'post',
-            data: {
-              type: '3',
-              name: `SELECT [组号] ,组件名称 ,sum(convert(int,零件数量)) as 总零件数量
-                    ,sum(已到货数量) as 总到货数量
-                    , (case when sum(convert(int,零件数量)) = SUM(已到货数量) then GETDATE() ELSE '' END)完成时间
-                    FROM (
-                    SELECT     dbo.车间管理_车间采购_请购单明细.机床流水号, dbo.车间管理_车间采购_请购单明细.组号, dbo.PDM_组件名称.组件名称, dbo.车间管理_车间采购_请购单明细.零件数量,
-                    dbo.车间管理_车间采购_请购单明细.已到货数量
-                    FROM         dbo.PDM_组件名称 RIGHT OUTER JOIN
-                    dbo.车间管理_车间采购_请购单明细 ON dbo.PDM_组件名称.组件流水号 = dbo.车间管理_车间采购_请购单明细.组件流水号
-                    ) as a where a.机床流水号 = ${this.machineValue}
-                    group by a.[组号],a.组件名称`
-            }
-          }).then(res => {
-            console.log(res, 98765)
-            this.tableDataDiv9C = res.data
-          })
-        })
-      })
-    },
-    // 查询车间加工div数据
-    async searchDiv10() {
-=======
           name: `SELECT *
   FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue} and 组件流水号 is  null`
         }
@@ -5142,7 +3934,6 @@ export default {
       this.dataDiv13.xData = []
       this.dataDiv13.yDataA = []
       this.dataDiv13.yDataB = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -5153,12 +3944,6 @@ export default {
       this.showDiv7 = false
       this.showDiv8 = false
       this.showDiv9 = false
-<<<<<<< HEAD
-      this.showDiv10 = true
-      this.showDiv11 = false
-      this.showDiv12 = false
-      this.dataDiv10.data = []
-=======
       this.showDiv10 = false
       this.showDiv11 = false
       this.showDiv12 = false
@@ -5173,90 +3958,11 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.showDiv23 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue}, @计划类型=4`
-        }
-      }).then(res => {
-        this.tableDataDiv10 = res.data
-        request({
-          url: '',
-          method: 'post',
-          data: {
-            type: '3',
-            name: `select COUNT(*) as 未完成
-                   from 项目计划管理_组件计划_视图
-                   where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is null`
-          }
-        }).then(res => {
-          if (res.data[0].未完成 !== 0) {
-            this.dataDiv10.data.push({
-              name: '未完成',
-              value: res.data[0].未完成
-            })
-          }
-        }).then(() => {
-          request({
-            url: '',
-            method: 'post',
-            data: {
-              type: '3',
-              name: `select COUNT(*) as 已完成
-                     from 项目计划管理_组件计划_视图
-                     where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is not null`
-            }
-          }).then(res => {
-            if (res.data[0].已完成 !== 0) {
-              this.dataDiv10.data.push({
-                name: '已完成',
-                value: res.data[0].已完成
-              })
-            }
-            this.drawLineDiv10()
-          })
-        })
-      })
-    },
-    // 绘制油漆div饼图
-    drawLineDiv10() {
-      const bar = echarts.init(document.getElementById('barDiv10'))
-      // 指定图表的配置项和数据
-      bar.setOption({
-        tooltip: {
-          trigger: 'item',
-          formatter: '{a} <br/>{b} : {c} ({d}%)'
-        },
-        legend: {
-          orient: 'vertical',
-          left: 'left',
-          data: ['已完成', '未完成']
-        },
-        series: [
-          {
-            name: '状态比例',
-            type: 'pie',
-            radius: '55%',
-            center: ['50%', '45%'],
-            data: this.dataDiv10.data,
-            itemStyle: {
-              emphasis: {
-                shadowBlur: 10,
-                shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
-              }
-            }
-          }
-        ]
-      })
-    },
-    // 查询自家备料div数据
-    async searchDiv11() {
-=======
           name: `declare @机床流水号 int = ${this.machineValue}
                   select 机床流水号,组号,组件名称,SUM(零件总数) as 零件总数,SUM(未制定零件数) as 未制定零件数,SUM(已制定零件数) as 已制定零件数 from (
                   --总
@@ -5328,7 +4034,6 @@ export default {
       this.dataDiv14.xData = []
       this.dataDiv14.yDataA = []
       this.dataDiv14.yDataB = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -5340,13 +4045,6 @@ export default {
       this.showDiv8 = false
       this.showDiv9 = false
       this.showDiv10 = false
-<<<<<<< HEAD
-      this.showDiv11 = true
-      this.showDiv12 = false
-      this.dataDiv11.yDataB = []
-      this.dataDiv11.yDataA = []
-      this.dataDiv11.xData = []
-=======
       this.showDiv11 = false
       this.showDiv12 = false
       this.showDiv13 = false
@@ -5360,64 +4058,12 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.showDiv23 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
           name: `declare @机床流水号 int = ${this.machineValue}
-<<<<<<< HEAD
-                  select *,(case when 100 * 已备料条数/零件条数 = 100 then '' else '——' end) as 完成时间 from (
-                  select case when 已备料条数 = 零件条数 then '完成' else '未完成' end as 状态
-                  ,所有.*,已备料条数
-                  ,100*已备料条数/零件条数 as 备料进度
-                  from (
-                  select PDM_组件名称.组号,PDM_组件名称.组件名称,PDM_机床名称.机床流水号
-                  ,COUNT(*) as 零件条数
-                  from (SELECT  [工艺计划流水号],[零件图号], [零件名称], [备料打印] , [备料到货]
-                  from [车间生产管理工艺_零件工艺计划_传递后_视图]
-                  WHERE   考核状态 >= 3 and 考核状态 <8 and 工艺任务分配状态 =2 and 批次零件状态=1 and 备料打印 = 1 and 机床流水号 = @机床流水号
-                  and 工艺计划流水号 in ( select  工艺计划流水号 from 车间生产管理工艺_零件工序 where 工艺编号 = 29 )) as 自制备料
-                  inner join 车间生产管理工艺_零件工艺计划 on 自制备料.工艺计划流水号 = 车间生产管理工艺_零件工艺计划.工艺计划流水号
-                  inner join MRP_计划订单_组件零件清单_基本件 on 车间生产管理工艺_零件工艺计划.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件.组件零件基本件流水号
-                  inner join MRP_计划订单_机床组件清单 on MRP_计划订单_机床组件清单.机床组件流水号 = MRP_计划订单_组件零件清单_基本件.机床组件流水号
-                  inner join PDM_组件名称 on PDM_组件名称.组件流水号 = MRP_计划订单_机床组件清单.组件流水号
-                  inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-                  group by PDM_组件名称.组号,PDM_组件名称.组件名称,PDM_机床名称.机床流水号,PDM_机床名称.机床图号
-                  ) as 所有
-                  left join
-                  (select 自制备料.备料到货
-                  ,PDM_组件名称.组号,PDM_组件名称.组件名称,PDM_机床名称.机床流水号
-                  ,COUNT(*) as 已备料条数
-                  from (SELECT  [工艺计划流水号],[零件图号], [零件名称], [备料打印] , [备料到货]
-                  from [车间生产管理工艺_零件工艺计划_传递后_视图]
-                  WHERE   考核状态 >= 3 and 考核状态 <8 and 工艺任务分配状态 =2 and 批次零件状态=1 and 备料打印 = 1 and 备料到货 = 1 and 机床流水号 = @机床流水号
-                  and 工艺计划流水号 in ( select  工艺计划流水号 from 车间生产管理工艺_零件工序 where 工艺编号 = 29 )) as 自制备料
-                  inner join 车间生产管理工艺_零件工艺计划 on 自制备料.工艺计划流水号 = 车间生产管理工艺_零件工艺计划.工艺计划流水号
-                  inner join MRP_计划订单_组件零件清单_基本件 on 车间生产管理工艺_零件工艺计划.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件.组件零件基本件流水号
-                  inner join MRP_计划订单_机床组件清单 on MRP_计划订单_机床组件清单.机床组件流水号 = MRP_计划订单_组件零件清单_基本件.机床组件流水号
-                  inner join PDM_组件名称 on PDM_组件名称.组件流水号 = MRP_计划订单_机床组件清单.组件流水号
-                  inner join PDM_机床名称 on PDM_组件名称.机床流水号 = PDM_机床名称.机床流水号
-                  inner join 车间生产管理工艺_备料出库记录 on 车间生产管理工艺_零件工艺计划.工艺计划流水号 = 车间生产管理工艺_备料出库记录.工艺计划流水号
-                  group by PDM_组件名称.组号,PDM_组件名称.组件名称,PDM_机床名称.机床流水号,PDM_机床名称.机床图号,自制备料.备料到货) as 完成
-                  on 所有.组号 = 完成.组号 and 所有.机床流水号 = 完成.机床流水号
-                  ) as 头`
-        }
-      }).then(res => {
-        this.tableDataDiv11 = res.data
-        for (let i = 0; i < res.data.length; i++) {
-          this.dataDiv11.xData.push(res.data[i].组号)
-          this.dataDiv11.yDataA.push(res.data[i].零件条数)
-          this.dataDiv11.yDataB.push(res.data[i].已备料条数)
-        }
-        this.drawLineDiv11()
-      })
-    },
-    // 绘制自家备料条形图
-    drawLineDiv11() {
-      const bar = echarts.init(document.getElementById('barDiv11'))
-=======
                   select 机床流水号
                   ,a.组件流水号
                   ,组号
@@ -5480,41 +4126,18 @@ export default {
     // 绘制定额条形图
     drawLineDiv14() {
       const bar = echarts.init(document.getElementById('barDiv14'))
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       // 指定图表的配置项和数据
       bar.setOption({
         tooltip: {},
         legend: {
-<<<<<<< HEAD
-          data: ['零件条数', '已备料条数']
-        },
-        xAxis: {
-          data: this.dataDiv11.xData,
-=======
           data: ['零件总数', '已编制条数']
         },
         xAxis: {
           data: this.dataDiv14.xData,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           show: true
         },
         yAxis: {},
         series: [{
-<<<<<<< HEAD
-          name: '零件条数',
-          type: 'bar',
-          data: this.dataDiv11.yDataA
-        },
-        {
-          name: '已备料条数',
-          type: 'bar',
-          data: this.dataDiv11.yDataB
-        }]
-      })
-    },
-    // 查询自制件质检数据
-    async searchDiv12() {
-=======
           name: '零件总数',
           type: 'bar',
           data: this.dataDiv14.yDataA
@@ -5530,7 +4153,6 @@ export default {
       this.dataDiv15.xData = []
       this.dataDiv15.yDataA = []
       this.dataDiv15.yDataB = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.showDiv0 = false
       this.showDiv1 = false
       this.showDiv2 = false
@@ -5543,9 +4165,6 @@ export default {
       this.showDiv9 = false
       this.showDiv10 = false
       this.showDiv11 = false
-<<<<<<< HEAD
-      this.showDiv12 = true
-=======
       this.showDiv12 = false
       this.showDiv13 = false
       this.showDiv14 = false
@@ -5558,32 +4177,11 @@ export default {
       this.showDiv21 = false
       this.showDiv22 = false
       this.showDiv23 = false
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       await request({
         url: '',
         method: 'post',
         data: {
           type: '3',
-<<<<<<< HEAD
-          name: `SELECT
-                  [组号]
-                  ,[组件名称]
-                  ,sum([数量]) as 检测总数量
-                  ,sum([不合格数量]) as 不合格总数量
-                  ,sum([批次数量]) 零件总数量
-               ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
-                  ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
-              FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue}
-              group by 组号, 组件名称 order by 组号`
-        }
-      }).then(res => {
-        console.log(res)
-        this.tableDataDiv12 = res.data
-      })
-    },
-    aaa() {
-      console.log(this.dataDiv10.data, 89)
-=======
           name: `declare @机床流水号 int = ${this.machineValue}
                   create table #临时表1
                   (
@@ -5716,7 +4314,6 @@ export default {
       }).then(res => {
         this.tableDataDiv23 = res.data
       })
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     }
   }
 }
@@ -5741,18 +4338,12 @@ export default {
   .showDiv{
     height: 380px;
   }
-<<<<<<< HEAD
-  .module{
-    border-radius: 6px;
-    border: 3px solid black;
-=======
   .el-button{
     padding-top: 5px;
   }
   .module{
     border-radius: 6px;
     border: 1px solid black;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     /*background-color: white;*/
     display: inline-block;
   }
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 1a891812..1b282fee 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/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
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index ae517b80..c2692f4d 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/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>
diff --git a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue b/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
index 7ee21e62..b54e0131 100644
--- a/src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue
+++ b/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;
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index ef7d0a26..75f48817 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/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>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 2f066eaf..059bea53 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/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>
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index 7d013d77..336a7e54 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/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 = ''
diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index 779a9b5f..1ff597e2 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/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
             })
           })
diff --git a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue b/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
index ad7fbc2b..3f9854df 100644
--- a/src/views/ManufacturingCenter/RepairTimeEntry/index.vue
+++ b/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>
diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index a66ce45e..4a4b4547 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/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') {
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index 1781aca9..ed1b2ef3 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/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.设备编号
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index 02489b43..06a36fde 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -4,17 +4,10 @@
     <el-card>
       <!--<el-radio v-model="radio" label="1">未收回</el-radio>-->
       <!--<el-radio v-model="radio" label="2">已收回</el-radio>-->
-<<<<<<< HEAD
       <span>招标企业：</span>
       <el-input v-model="TenderingEnterprise" clearable size="small" style="width:150px;margin: 3px" placeholder="请输入招标企业"/>
       <span style="margin-left: 10px">保金类型：</span>
       <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="width: 150px">
-=======
-      <span style="margin-left: 10px">招标企业：</span>
-      <el-input v-model="TenderingEnterprise" clearable size="small" style="width:140px" placeholder="请输入招标企业"/>
-      <span style="margin-left: 20px">保金类型：</span>
-      <el-select v-model="TypeOfGoldDepositValue" clearable filterable placeholder="请选择" size="small" style="margin-left: 10px;width: 100px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in TypeOfGoldDeposit"
           :key="item.value"
@@ -22,11 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span style="margin-left: 10px">投标人：</span>
-<<<<<<< HEAD
       <el-input v-model="Bidder" clearable size="small" style="width:150px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
-=======
-      <el-input v-model="Bidder" clearable size="small" style="width:100px" placeholder="请选择" readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 1;searchPer()" @clear="clear()"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
         v-model="startTime"
@@ -52,7 +41,6 @@
       <el-table
         v-loading="tableData1Loading"
         :data="tableData1"
-<<<<<<< HEAD
         style="width: 100%; margin-top: 3px"
         height="770"
         highlight-current-row=""
@@ -60,13 +48,6 @@
         stripe
         size="mini">
         <el-table-column align="center" label="投标结果" width="200">
-=======
-        style="width: 100%"
-        height="600"
-        border
-        size="mini">
-        <el-table-column align="center" label="投标结果" width="190">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.投标结果" @change="changeTenderResult(scope.row)">
               <el-radio :disabled="scope.row.是否禁用已中标" label="1">已中标</el-radio>
@@ -74,11 +55,7 @@
             </el-radio-group>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="公布日期" width="90">
-=======
-        <el-table-column align="center" label="公布日期" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ !scope.row.公布日期 ? '未公布' : scope.row.公布日期.substring(0 , scope.row.公布日期.length - 8) }}
           </template>
@@ -93,11 +70,7 @@
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="100">
-=======
-        <el-table-column align="center" label="联系电话" width="120">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系电话 }}
           </template>
@@ -167,7 +140,6 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="收回" placement="top">
@@ -217,38 +189,6 @@
         </el-table-column>
       </el-table>
       <div class="block">
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="400">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.是否禁用"
-              size="mini"
-              type="success"
-              icon="el-icon-edit"
-              @click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用履约"
-              size="mini"
-              type="info"
-              icon="el-icon-edit"
-              @click.stop="ComplianceGold(scope.row)">履约</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用编辑"
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用删除"
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="delBidBond(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
@@ -273,11 +213,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-<<<<<<< HEAD
         <el-table :data="ListPeople" highlight-current-row height="400" size="mini" stripe style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange" >
-=======
-        <el-table :data="ListPeople" highlight-current-row height="400" size="mini" style="width: 400px;float: left;margin-left: 30px" @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="考勤编号" align="center" >
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}
@@ -305,11 +241,7 @@
     </el-dialog>
 
     <!--收回投标保证金-->
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible1" title="收回投标保证金" center style="min-height: 300px" width="20%">
-=======
-    <el-dialog :visible.sync="dialogFormVisible1" title="收回" center style="min-height: 300px" width="20%">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="实际收回日期" prop="收回日期">
           <el-date-picker
@@ -369,11 +301,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="投标人" prop="投标人">
-<<<<<<< HEAD
               <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2;searchPer()" @clear="clear()"/>
-=======
-              <el-input v-model="form2.投标人" size="small" placeholder="请输入投标人" style="width: 200px;" clearable readonly @dblclick.native="dialogFormVisiblePeople = true;flag2 = 2" @clear="clear()"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             </el-form-item>
           </el-col>
         </el-row>
@@ -756,11 +684,7 @@ export default {
     },
     addBidBond() {
       this.addForm('form2')
-<<<<<<< HEAD
       this.title = '新增投标保证金'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible2 = true
     },
     addTableData1() {
@@ -777,11 +701,7 @@ export default {
     },
     editBidBond(row) {
       this.editForm(row, 'form2')
-<<<<<<< HEAD
       this.title = '编辑投标保证金'
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible2 = true
       this.form2.招标企业 = row.招标企业
       this.form2.联系人 = row.联系人
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 3e79b956..2b0c28fb 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -2,11 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>客户名称：</span>
-<<<<<<< HEAD
       <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px" size="small" clearable>
-=======
-      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin-right: 10px" size="small" clearable>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in CustomerName"
           :key="item.value"
@@ -25,20 +21,11 @@
       <!--:value="item.value">-->
       <!--</el-option>-->
       <!--</el-select>-->
-<<<<<<< HEAD
       <el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-card>
       <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
       <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
-=======
-      <el-button type="success" icon="el-icon-search" class="move" size="small" @click="selectCustomerOfName">查询</el-button>
-    </el-card>
-    <el-card>
-      <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click="addMarketingManager();flag = 1">添加销售经理</el-button>
-      <span style="float: right">销售经理</span>
-      <el-table v-loading="loading3" :data="tableData3" height="192" size="mini" style="width: 100%;margin-top: 10px" border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <!--<el-table-column label="责权省份" align="center" min-width="80">-->
         <!--<template slot-scope="scope">-->
         <!--{{ scope.row.省份 }}-->
@@ -64,7 +51,6 @@
             {{ scope.row.出生日期 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" align="center" width="100px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -86,37 +72,18 @@
                   @click="handleDeleteMarketingManager(scope.$index, scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              class="el-icon-edit"
-              @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              class="el-icon-delete"
-              @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
     </el-card>
     <el-row>
-<<<<<<< HEAD
       <el-col :span="3">
-=======
-      <el-col :span="5">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-card>
           <el-table
             v-loading="loading1"
             ref="multipleTable"
             :data="tableData1"
             stripe
-<<<<<<< HEAD
             highlight-current-row
             tooltip-effect="dark"
             style="width: 100%; margin-top: 3px;"
@@ -124,23 +91,11 @@
             size="mini"
             border>
             <el-table-column align="center" label="序号" width="65">
-=======
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="690"
-            size="mini"
-            border>
-            <el-table-column align="center" label="序号" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 <el-radio :label="scope.row.省份流水号" v-model="radio" @change="pageCurrent = 1;pageSize = 30;getCurrentRow(scope.row.省份流水号, scope.row.省份)"/>
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column align="center" label="地区" width="auto">
-=======
-            <el-table-column align="center" label="地区">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.省份 }}
               </template>
@@ -148,65 +103,36 @@
           </el-table>
         </el-card>
       </el-col>
-<<<<<<< HEAD
       <el-col :span="21">
         <el-card>
           <el-button icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
           <el-table v-loading="loading2" :data="tableData2" highlight-current-row height="640" size="mini" stripe style="width: 100%;margin-top: 2px" border>
             <el-table-column label="客户名称" align="center" min-width="180" show-overflow-tooltip>
-=======
-      <el-col :span="19">
-        <el-card>
-          <el-button type="text" icon="el-icon-circle-plus-outline" size="mini" @click = "addCustomer();flag1 = 1">新增客户</el-button>
-          <span style="float: right">客户信息</span>
-          <el-table v-loading="loading2" :data="tableData2" height="620" size="mini" style="width: 100%;margin-top: 10px" border>
-            <el-table-column label="客户名称" align="center" min-width="340">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.客户名称 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="联系人" align="center" min-width="80" show-overflow-tooltip>
-=======
-            <el-table-column label="联系人" align="center" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.联系人 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="联系电话" align="center" min-width="100" show-overflow-tooltip>
-=======
-            <el-table-column label="联系电话" align="center" min-width="300">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.电话 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="开票电话" align="center" min-width="100">
-=======
-            <el-table-column label="开票电话" align="center" min-width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.传真 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="联系地址" align="center" min-width="150" show-overflow-tooltip>
-=======
-            <el-table-column label="联系地址" align="center" min-width="350">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.地址 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="电子邮箱" align="center" min-width="150">
-=======
-            <el-table-column label="电子邮箱" align="center" min-width="250">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.电子邮箱 }}
               </template>
@@ -216,20 +142,12 @@
                 {{ scope.row.税号 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="开户行" align="center" min-width="140" show-overflow-tooltip>
-=======
-            <el-table-column label="开户行" align="center" min-width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.开户行 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="银行账号" align="center" min-width="140">
-=======
-            <el-table-column label="银行账号" align="center" min-width="260">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.银行账号 }}
               </template>
@@ -239,16 +157,11 @@
                 {{ scope.row.价值评估 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="备注" align="center" show-overflow-tooltip>
-=======
-            <el-table-column label="备注" align="center" min-width="350">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-<<<<<<< HEAD
             <el-table-column label="操作" align="center" min-width="100px" fixed="right">
               <template slot-scope="scope">
                 <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -270,20 +183,6 @@
                       @click="handleDelete(scope.$index, scope.row)"/>
                   </div>
                 </el-tooltip>
-=======
-            <el-table-column label="操作" align="center" min-width="200px" fixed="right">
-              <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="primary"
-                  class="el-icon-edit"
-                  @click="handleEdit(scope.row);flag1 = 2">编辑</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>
@@ -325,11 +224,7 @@
             @node-click="handleNodeClick"
           />
         </div>
-<<<<<<< HEAD
         <el-table :data="ListPeople" height="400" stripe style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
-=======
-        <el-table :data="ListPeople" height="400" style="width: 400px;float: left;margin-left: 30px" size="mini" highlight-current-row @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="考勤编号" align="center" >
             <template slot-scope="scope">
               {{ scope.row.考勤编号 }}
@@ -635,11 +530,7 @@ export default {
     },
     addMarketingManager() {
       this.dialogFormVisible1 = true
-<<<<<<< HEAD
       this.title1 = '新增营销经理'
-=======
-      this.title1 = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.addForm('form1')
     },
     callOff1() {
@@ -712,11 +603,7 @@ export default {
     },
     handleEditMarketingManager(row) {
       this.dialogFormVisible1 = true
-<<<<<<< HEAD
       this.title1 = '编辑营销经理'
-=======
-      this.title1 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form1.营销经理 = row.姓名
       this.peopleid = row.营销经理流水号
       this.a = row.营销经理地区流水号
@@ -727,11 +614,7 @@ export default {
         this.$message.warning('请选择一个省份')
       } else {
         this.dialogFormVisible2 = true
-<<<<<<< HEAD
         this.title2 = '新增客户'
-=======
-        this.title2 = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       }
       selectAdressOfID(this.AdressID).then(response => {
         this.form2.省份 = response.data[0].省份
@@ -742,11 +625,7 @@ export default {
     },
     handleEdit(row) {
       this.dialogFormVisible2 = true
-<<<<<<< HEAD
       this.title2 = '编辑客户'
-=======
-      this.title2 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form2.省份 = row.省份
       this.form2.客户名称 = row.客户名称
       this.form2.联系电话 = row.电话
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 2cafcff3..33cf4c84 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -2,11 +2,7 @@
   <div>
     <el-card>
       <span>项目名称：</span>
-<<<<<<< HEAD
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin: 3px" size="small">
-=======
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" style="margin-right: 10px" size="small">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in entryName"
           :key="item.value"
@@ -16,11 +12,7 @@
       <span style="margin-left: 10px">机床型号：</span>
       <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       <span style="margin-left: 10px">销售经理：</span>
-<<<<<<< HEAD
       <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
-=======
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
         v-model="startTime"
@@ -47,7 +39,6 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         highlight-current-row
-<<<<<<< HEAD
         style="width: 100%; margin-top: 3px"
         height="600"
         border
@@ -58,17 +49,6 @@
         <el-table-column type="expand" label="详情">
           <template slot-scope="scope">
             <el-table :data="tableData2" border stripe style="width: 400px; text-align: center" size="mini">
-=======
-        style="width: 100%"
-        height="300"
-        border
-        size="mini"
-        @row-click="fetchTableData"
-        @expand-change="selectMachine">
-        <el-table-column type="expand">
-          <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 350px; text-align: center" size="mini">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-table-column label="设备型号" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
@@ -82,22 +62,14 @@
             </el-table>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同编号" width="130">
-=======
-        <el-table-column align="center" label="合同编号" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <template>
               <el-tag slot="reference" type="small">{{ scope.row.合同编号 }}</el-tag>
             </template>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -132,57 +104,33 @@
             {{ scope.row.安装调试节点 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="销售经理" width="90">
-=======
-        <el-table-column align="center" label="销售经理" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="客户名称" width="230" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称" width="230">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系人" width="90" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系人" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系电话" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同信息备注" width="auto">
-=======
-        <el-table-column align="center" label="合同信息备注" width="142">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
       </el-table>
-<<<<<<< HEAD
       <div class="block">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
@@ -196,28 +144,17 @@
 
     <!--营销经理选择-->
     <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="30%">
-<<<<<<< HEAD
       <span>责权省份: </span>
       <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" size="small" @change="changeProvince">
-=======
-      <span>责权省份</span>
-      <el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in Province"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <div style="margin-top: 5px">
         <el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
           <el-table-column label="营销经理" align="center" >
-=======
-      <div style="margin-top: 15px">
-        <el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
-          <el-table-column label="销售经理" align="center" >
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
             </template>
@@ -236,7 +173,6 @@
     </el-dialog>
     <el-card class="box-card">
       <div class="block" style="border: 1px solid rgb(220, 223, 230)">
-<<<<<<< HEAD
         <el-carousel :autoplay="true" trigger="click" height="100px">
           <el-carousel-item>
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToContractCapitalManagement">收款情况</el-button>
@@ -247,17 +183,6 @@
               height="100"
               border
               stripe
-=======
-        <el-carousel :autoplay="true" trigger="click" height="350px">
-          <el-carousel-item>
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToContractCapitalManagement">收款情况</el-button>
-            <el-table
-              v-loading="listLoadingContractCapitalManagement"
-              :data="tableDataContractCapitalManagement"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini">
               <el-table-column align="center" label="付款方式" width="100">
                 <template slot-scope="scope">
@@ -319,7 +244,6 @@
             </el-table>
           </el-carousel-item>
           <el-carousel-item>
-<<<<<<< HEAD
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceRecord">开票情况</el-button>
             <el-table
               v-loading="listLoadingInvoiceRecord"
@@ -328,26 +252,13 @@
               height="100"
               border
               stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceRecord">开票情况</el-button>
-            <el-table
-              v-loading="listLoadingInvoiceRecord"
-              :data="tableDataInvoiceRecord"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini">
               <el-table-column
                 align="center"
                 label="序号"
                 type="index"
                 width="50"/>
-<<<<<<< HEAD
               <el-table-column align="center" label="发票抬头" width="200">
-=======
-              <el-table-column align="center" label="发票抬头" width="180">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <template slot-scope="scope">
                   {{ scope.row.客户名称 }}
                 </template>
@@ -395,26 +306,16 @@
             </el-table>
           </el-carousel-item>
           <el-carousel-item>
-<<<<<<< HEAD
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToInvoiceDeliveryManagement">发货情况</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <el-table
               v-loading="tableDataLoadingDeliveryManagement"
               id="tb"
               :data="tableDataDeliveryManagement"
               highlight-current-row
-<<<<<<< HEAD
               style="width: 99%"
               height="100"
               border
               stripe
-=======
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini"
             >
               <el-table-column align="center" label="发货单号">
@@ -465,7 +366,6 @@
             </el-table>
           </el-carousel-item>
           <el-carousel-item>
-<<<<<<< HEAD
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToBidBond">投标保证金</el-button>
             <el-table
               v-loading="tableData1LoadingBidBond"
@@ -474,15 +374,6 @@
               height="100"
               border
               stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToBidBond">投标保证金</el-button>
-            <el-table
-              v-loading="tableData1LoadingBidBond"
-              :data="tableDataBidBond"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini">
               <el-table-column align="center" label="投标结果" width="190">
                 <template slot-scope="scope">
@@ -580,25 +471,15 @@
             </el-table>
           </el-carousel-item>
           <el-carousel-item>
-<<<<<<< HEAD
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToPerformanceBond">履约保证金</el-button>
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToPerformanceBond">履约保证金</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <el-table
               v-loading="listLoadingPerformanceBond"
               v-show="showPerformanceBond"
               :data="tableDataPerformanceBond"
-<<<<<<< HEAD
               style="width: 99%"
               height="100"
               border
               stripe
-=======
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini">
               <el-table-column align="center" label="履约保证金金额">
                 <template slot-scope="scope">
@@ -663,7 +544,6 @@
             </div>
           </el-carousel-item>
           <el-carousel-item>
-<<<<<<< HEAD
             <el-button type="text" style="margin: 3px;padding: 0px;" @click="goToSafetyMargin">安全保证金</el-button>
             <el-table
               v-loading="listLoadingSafetyMargin"
@@ -672,15 +552,6 @@
               height="100"
               border
               stripe
-=======
-            <el-button type="text" style="margin-left: 15px;margin-top: 15px" @click="goToSafetyMargin">安全保证金</el-button>
-            <el-table
-              v-loading="listLoadingSafetyMargin"
-              :data="tableDataSafetyMargin"
-              style="width: 99%;margin-left: 10px;margin-right: 10px"
-              height="300"
-              border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini">
               <el-table-column align="center" label="保证金金额" width="100">
                 <template slot-scope="scope">
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 18c804a6..3165a5ac 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -2,32 +2,19 @@
   <div class="app-container">
     <el-card>
       <span>项目名称：</span>
-<<<<<<< HEAD
       <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px " size="small" clearable>
-=======
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in entryName"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">营销经理：</span>
       <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
       <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
       <el-badge :value="value" :max="99" class="item">
         <el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>
-=======
-      <span style="margin-left: 10px">销售经理：</span>
-      <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clear()"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD('form2')">新增</el-button>
-      <el-badge :value="value" :max="99" class="item">
-        <el-button size="small" type="text" @click="AccountsReceivable">查看收款信息</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       </el-badge>
     </el-card>
     <el-card>
@@ -36,7 +23,6 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         :data="tableData1"
-<<<<<<< HEAD
         style="width: 100%;"
         height="500px"
         highlight-current-row
@@ -49,19 +35,6 @@
           <template slot-scope="scope">
             <el-table :data="tableData3" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
               <el-table-column label="发货单号" align="center" >
-=======
-        style="width: 100%;max-height: 440px;"
-        height="280"
-        highlight-current-row
-        border
-        size="mini"
-        @expand-change="selectMachine"
-        @row-click="getTableData2">
-        <el-table-column type="expand">
-          <template slot-scope="scope">
-            <el-table :data="tableData3" border style="width: 600px; text-align: center" size="mini">
-              <el-table-column label="发货单号" align="center">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <template slot-scope="scope">
                   {{ scope.row.发货单号 }}
                 </template>
@@ -79,138 +52,78 @@
             </el-table>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同编号" width="140">
           <template slot-scope="scope">
             <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="80" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="合同编号" width="150">
-          <template slot-scope="scope">
-            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="已完成进度" width="90">
-=======
-        <el-table-column align="center" label="已完成进度" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.执行进度名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="付款方式" width="80">
-=======
-        <el-table-column align="center" label="付款方式" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同总金额（万元）" width="130">
-=======
-        <el-table-column align="center" label="合同总金额（万元）" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同总金额 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="已到账金额（万元）" width="130">
-=======
-        <el-table-column align="center" label="已到账金额（万元）" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.已支付 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="未到账金额（万元）" width="130">
           <template slot-scope="scope">
             <el-tag size="mini" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
-=======
-        <el-table-column align="center" label="未到账金额（万元）" width="150">
-          <template slot-scope="scope">
-            <el-tag size="small" style="width: 100px" type="warning">{{ scope.row.未支付金额 }}</el-tag>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
         <el-table-column align="center" label="付款进度" width="150">
           <template slot-scope="scope">
             <div style="width: 130px">
-<<<<<<< HEAD
               <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />
             </div>
           </template>
         </el-table-column>
         <el-table-column align="center" label="营销经理" width="70">
-=======
-              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" status="success" />
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="营销经理" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="客户名称" width="160" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称" width="260">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系人" width="60">
-=======
-        <el-table-column align="center" label="联系人" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系电话" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="银行账号" width="230">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.银行账号 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="税号" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="税号" width="230">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.税号 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="140">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -237,25 +150,6 @@
         </el-table-column>
       </el-table>
       <div class="block">
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.是否禁用编辑"
-              size="mini"
-              type="warning"
-              icon="el-icon-edit"
-              @click.stop="EditTableData(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="dellist(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
@@ -273,7 +167,6 @@
         :row-key="getRowKeys1"
         :expand-row-keys="expands1"
         :data="tableData2"
-<<<<<<< HEAD
         style="width: 100%;max-height: 440px;text-align: center"
         height="210"
         highlight-current-row
@@ -284,17 +177,6 @@
         <el-table-column type="expand" label="详情">
           <template slot-scope="scope">
             <el-table :data="tableData4" class="subTableHeader" border stripe style="width: 600px; text-align: center" size="mini">
-=======
-        style="width: 100%;max-height: 440px; margin-top: 15px; text-align: center"
-        height="220"
-        highlight-current-row
-        border
-        size="mini"
-        @expand-change="selectMachine1">
-        <el-table-column type="expand">
-          <template slot-scope="scope">
-            <el-table :data="tableData4" border style="width: 600px; text-align: center" size="mini">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-table-column
                 align="center"
                 label="序号"
@@ -312,7 +194,6 @@
               </el-table-column>
               <el-table-column label="操作" fixed="right" align="center" width="250">
                 <template slot-scope="scope">
-<<<<<<< HEAD
                   <el-tooltip effect="dark" content="编辑" placement="top">
                     <div style="display: inline-block">
                       <el-button
@@ -332,18 +213,6 @@
                         @click="handleDelete2(scope.row)"/>
                     </div>
                   </el-tooltip>
-=======
-                  <el-button
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-delete"
-                    @click="handleEdit2(scope.row);flag = 2">编辑</el-button>
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="handleDelete2(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 </template>
               </el-table-column>
             </el-table>
@@ -364,33 +233,19 @@
             {{ scope.row.已收金额 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="未收金额（万元）" width="200px">
-=======
-        <el-table-column align="center" label="未收金额（万元）" width="180px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-tag type="warning" style="width: 100px" size="small">{{ scope.row.未收金额 }}</el-tag>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="转下阶段收款金额" width="200px">
-=======
-        <el-table-column align="center" label="转下阶段收款金额" width="180px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.转下阶段金额 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="收款阶段" width="200px">
           <template slot-scope="scope">
             <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="mini" @change="changeTime(scope.row)">
-=======
-        <el-table-column align="center" label="收款阶段" width="180px">
-          <template slot-scope="scope">
-            <el-select v-model="scope.row.执行进度id" filterable placeholder="请选择收款阶段" style="width: 130px" size="small" @change="changeTime(scope.row)">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-option
                 v-for="item in plannedTime"
                 :key="item.value"
@@ -399,7 +254,6 @@
             </el-select>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="截止时间" width="200px">
           <template slot-scope="scope">
             <span>后</span>
@@ -408,16 +262,6 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="状态" >
-=======
-        <el-table-column align="center" label="截止时间" width="180px">
-          <template slot-scope="scope">
-            <span>后</span>
-            <el-input v-model="scope.row.提前x天提醒" size="small" style="width:50px" placeholder="请输入提前X天提醒" @change="editDay(scope.row)"/>
-            <span>天内完成</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="状态" width="100px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-popover
               placement="top-start"
@@ -441,7 +285,6 @@
             </el-popover>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="140">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="收款" placement="top">
@@ -471,38 +314,6 @@
     </el-card>
     <!--新增合同资金对话框-->
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="220">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.是否禁用收款"
-              size="mini"
-              type="warning"
-              icon="el-icon-edit"
-              @click="handleEdit1(scope.row);flag=1">收款</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用"
-              size="mini"
-              type="danger"
-              icon="el-icon-sort"
-              @click="TransferPlan(scope.row)">收款转移</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="PageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <!--新增合同资金对话框-->
-    <el-dialog :visible.sync="dialogFormVisible2" title="新增合同收款计划" center width="380px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
         <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
           <el-select v-model="form2.entryNameValue" clearable filterable placeholder="请输入项目名称" style="margin-left: 2px; width: 200px" size="small" @change="searchProjectName">
@@ -526,11 +337,7 @@
       </div>
     </el-dialog>
     <!--编辑合同资金对话框-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible4" title="编辑付款计划" center width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
         <el-form-item label="项目名称" prop="entryNameValue" label-width="100px">
           <el-select v-model="form2.entryNameValue" :disabled="true" clearable filterable placeholder="请输入项目名称" style="width: 200px" size="small" @change="searchProjectName">
@@ -554,11 +361,7 @@
       </div>
     </el-dialog>
     <!--付款对话框-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible1" title="更新付款" center width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form" :model="form" :rules="rules1" label-position="left">
         <el-form-item label="项目名称" prop="EntryName" label-width="100px">
           <el-input v-model="form.EntryName" :disabled="true" size="small" placeholder="请输入项目名称"/>
@@ -596,17 +399,10 @@
       </div>
     </el-dialog>
     <!--营销经理选择-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
       <span>姓名：</span>
       <el-input v-model="name" clearable size="small" style="width: 200px"/>
       <el-button size="small" icon="el-icon-search" style="margin-left: 10px" type="success" @click="searchName">查询</el-button>
-=======
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
-      <span>姓名：</span>
-      <el-input v-model="name" clearable size="small" style="width: 200px"/>
-      <el-button size="small" type="success" @click="searchName">查询</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <!--<span>责权省份：</span>-->
       <!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
       <!--<el-option-->
@@ -616,11 +412,7 @@
       <!--:value="item.value"/>-->
       <!--</el-select>-->
       <div style="margin-top: 15px">
-<<<<<<< HEAD
         <el-table :data="dataPeople" border stripe size="mini" style="width: 100%; text-align: center;margin-top: 15px" highlight-current-row @row-click="handleChange">
-=======
-        <el-table :data="dataPeople" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -639,11 +431,7 @@
       </div>
     </el-dialog>
     <!--编辑批次资金-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
-=======
-    <el-dialog :title="title" :visible.sync="dialogFormVisible3" center width="450px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form3" :model="form3" :rules="rules2" label-position="left">
         <el-form-item label="本次收款金额" prop="本次付款" label-width="110px">
           <el-input-number v-model="form3.本次付款" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 232px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -664,11 +452,7 @@
       </div>
     </el-dialog>
     <!--转移收款-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible5" title="转下阶段收款" center width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form4" :model="form4" :rules="rules3" label-position="left">
         <el-form-item label="转移金额" prop="转移金额" label-width="110px">
           <el-input-number v-model="form4.转移金额" :min="0" :max="max1" :precision="2" :step="1" controls-position="right" size="small" style="width: 200px" placeholder="请输入本次付款金额" @change="changeMoney"/>
@@ -689,24 +473,14 @@
       </div>
     </el-dialog>
 
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="AccountsReceivableVisible" width="60%" >
       <el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border stripe>
         <el-table-column property="date" label="项目名称" align="center" show-overflow-tooltip>
-=======
-    <el-dialog :visible.sync="AccountsReceivableVisible" width="60%">
-      <el-table :data="gridData" :row-style="tableRowClassName" height="260" size="mini" border>
-        <el-table-column property="date" label="项目名称" width="200" align="center">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column property="name" label="客户名称" align="center" show-overflow-tooltip>
-=======
-        <el-table-column property="name" label="客户名称" align="center">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
@@ -716,11 +490,7 @@
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column property="date" label="联系电话" align="center" width="200px" show-overflow-tooltip>
-=======
-        <el-table-column property="date" label="联系电话" align="center" width="120px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
@@ -740,7 +510,6 @@
             {{ scope.row.状态 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column property="date" label="操作" align="center" width="150px">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="立即收款" placement="top">
@@ -762,18 +531,6 @@
                   @click="Never(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column property="date" label="操作" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="success"
-              @click="Detail(scope.row)">立即收款</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              @click="Never(scope.row)">不再提醒</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
@@ -1076,11 +833,7 @@ export default {
     },
     handleEdit2(row) {
       this.editForm(row, 'form3')
-<<<<<<< HEAD
       this.title = '编辑阶段收款'
-=======
-      this.title = '修改阶段收款'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.max1 = parseFloat(this.max2) + parseFloat(row.本次收款金额)
       this.dialogFormVisible3 = true
       this.form3.本次付款 = row.本次收款金额
@@ -1467,11 +1220,7 @@ export default {
     handleEdit1(row) {
       this.addForm('form3')
       this.changeTime1()
-<<<<<<< HEAD
       this.title = '收款'
-=======
-      this.title = '阶段记录收款'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.max1 = parseFloat(row.应收金额) - parseFloat(row.已收金额)
       this.dialogFormVisible3 = true
       this.id = row.批次资金id
@@ -1936,33 +1685,22 @@ export default {
 </script>
 
 <style scoped>
-<<<<<<< HEAD
   /*.el-card {*/
   /*  !*margin-top: 15px;*!*/
   /*}*/
 
-=======
-  .el-card {
-    margin-top: 15px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   .el-date-editor{
     width:237px;
   }
   .item {
     float: right;
-<<<<<<< HEAD
     margin: 3px;
-=======
-    margin-top: 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     margin-right: 40px;
   }
   .el-table td, .el-table th.is-leaf,
   .el-radio__inner,
   .el-input__inner{
     border: 1px solid black!important;
-<<<<<<< HEAD
     width: 150px;
     white-space: nowrap;
     overflow: hidden;
@@ -1986,7 +1724,5 @@ export default {
     tr.el-table__row.el-table__row--striped td {
       background: #e9f0f9 !important;
     }
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index f7ad0bbe..ef9d785f 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -1,16 +1,9 @@
 <template>
   <div class="app-container">
-<<<<<<< HEAD
     <el-card style="background: rgb(233,240,250)">
       <div>
         <span>项目名称：</span>
         <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px;">
-=======
-    <el-card>
-      <div>
-        <span>项目名称：</span>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-option
             v-for="item in entryName"
             :key="item.value"
@@ -19,17 +12,10 @@
         </el-select>
         <span style="margin-left: 10px">机床型号：</span>
         <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-<<<<<<< HEAD
         <span style="margin-left: 10px">营销经理：</span>
         <el-input v-model="MarketingManagerValue" clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
       </div>
       <div style="margin-top: 10px">
-=======
-        <span style="margin-left: 10px">销售经理：</span>
-        <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请选择营销经理" @dblclick.native="openName();param = 1" @clear="clear()"/>
-      </div>
-      <div style="margin-top: 20px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <span style="margin-top: 20px">开始日期：</span>
         <el-date-picker
           v-model="startTime"
@@ -41,11 +27,7 @@
         <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
-<<<<<<< HEAD
           style="width: 200px;margin-bottom: 3px;"
-=======
-          style="width: 200px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -60,7 +42,6 @@
         :data="tableData1"
         :row-key="getRowKeys"
         :expand-row-keys="expands"
-<<<<<<< HEAD
         highlight-current-row
         style="width: 100%;margin: 3px 0px"
         height="500"
@@ -73,27 +54,11 @@
           <template slot-scope="scope">
             <el-table :data="tableData2" class="subTableHeader" size="mini" border stripe style="width: 482px; text-align: center">
               <el-table-column label="设备型号" align="center" width="140">
-=======
-        style="width: 100%"
-        height="460"
-        border
-        size="mini"
-        @row-click="fetchExecutionProgressdata"
-        @expand-change="selectMachine">
-        <el-table-column type="expand">
-          <template slot-scope="scope">
-            <el-table :data="tableData2" border style="width: 571px; text-align: center" size="mini">
-              <el-table-column label="设备型号" align="center" width="130">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
-<<<<<<< HEAD
               <el-table-column label="设备名称" align="center" width="160" show-overflow-tooltip>
-=======
-              <el-table-column label="设备名称" align="center" width="160">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 <template slot-scope="scope">
                   {{ scope.row.机床名称 }}
                 </template>
@@ -103,7 +68,6 @@
                   {{ scope.row.机床数量 }}
                 </template>
               </el-table-column>
-<<<<<<< HEAD
               <el-table-column label="操作" width="100" align="center">
                 <template slot-scope="scope">
                   <el-tooltip effect="dark" content="编辑" placement="top">
@@ -132,166 +96,85 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同编号" width="130">
-=======
-              <el-table-column label="操作" width="200" align="center">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="warning"
-                    icon="el-icon-edit"
-                    @click="editMachine(scope.row);flag = 2">编辑</el-button>
-                  <el-button
-                    size="mini"
-                    type="danger"
-                    icon="el-icon-delete"
-                    @click="deleteMachine(scope.row)">删除</el-button>
-                </template>
-              </el-table-column>
-            </el-table>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="合同编号" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <template>
               <el-popover
                 placement="right"
-<<<<<<< HEAD
                 width="200"
                 trigger="hover">
                 <div v-show="!scope.row.招标企业" style="text-align: center">
                   <h4 style="margin: 5px 0">未缴纳投标保证金</h4>
-=======
-                title="投标保证金情况"
-                width="300"
-                trigger="hover">
-                <div v-show="!scope.row.招标企业" style="text-align: center">
-                  <h4>未缴纳投标保证金</h4>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 </div>
                 <div v-show="scope.row.招标企业">
                   <h4>招标企业： {{ scope.row.招标企业 }}</h4>
                   <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
                   <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
                 </div>
-<<<<<<< HEAD
                 <el-tag slot="reference" size="small">{{ scope.row.合同编号 }}</el-tag>
-=======
-                <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               </el-popover>
             </template>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="客户名称" width="190" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称" width="260">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="项目名称" width="140" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="付款方式" width="70">
-=======
-        <el-table-column align="center" label="付款方式" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同签订日期" width="100">
-=======
-        <el-table-column align="center" label="合同签订日期" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="图纸会签节点" width="100">
-=======
-        <el-table-column align="center" label="图纸会签节点" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.图纸会签节点 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="设备预验收节点" width="110">
-=======
-        <el-table-column align="center" label="设备预验收节点" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.设备预验收节点 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="发货节点" width="85">
-=======
-        <el-table-column align="center" label="发货节点" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.发货节点 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="安装调试节点" width="100">
-=======
-        <el-table-column align="center" label="安装调试节点" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.安装调试节点 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="销售经理" width="85">
-=======
-        <el-table-column align="center" label="销售经理" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.营销经理 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系人" width="70" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系人" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系电话" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同信息备注" >
-=======
-        <el-table-column align="center" label="合同信息备注" width="250">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-button
@@ -323,38 +206,12 @@
         </el-table-column>
       </el-table>
       <div class="block" >
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="300">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="warning"
-              icon="el-icon-plus"
-              @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="handleDelete(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
           :page-size="PageSize"
           :total="total"
-<<<<<<< HEAD
           style="margin-bottom: 3px;"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
@@ -362,11 +219,7 @@
     </el-card>
     <el-card v-show="ExecutionProgressShow">
       <div>
-<<<<<<< HEAD
         <h4 style="display: inline-block;margin: 3px;">项目进度</h4>
-=======
-        <h4 style="display: inline-block">项目进度</h4>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <div style="display: inline-block; float:right">
           <span>已完成进度：</span>
           <el-select v-model="executionProgressID" placeholder="请输入目前执行进度" size="small" style="width: 130px;margin-left: 20px" @change="changeExecutionProgressID">
@@ -393,11 +246,7 @@
       </div>
     </el-card>
     <el-card v-show="uploader" style="min-height: 145px;">
-<<<<<<< HEAD
       <h4 style="margin: 3px;">纪要文件</h4>
-=======
-      <h4>纪要文件</h4>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <div style="float: right;">
         <el-upload
           :action="action"
@@ -407,11 +256,7 @@
           :file-list="fileList"
           class="upload-demo"
           multiple>
-<<<<<<< HEAD
           <el-button size="small" type="primary" plain icon="el-icon-upload2">点击上传</el-button>
-=======
-          <el-button size="small" type="primary">点击上传</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-upload>
       </div>
       <div v-for="(file, key) in hadFile" :key="key">
@@ -432,11 +277,7 @@
       </div>
     </el-card>
     <!--新增合同信息对话框-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
-=======
-    <el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="140px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -461,11 +302,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-<<<<<<< HEAD
             <el-form-item label="营销经理" prop="MarketingManagerValue">
-=======
-            <el-form-item label="销售经理" prop="MarketingManagerValue">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-input v-model="form.MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName()" @clear="clear()"/>
             </el-form-item>
           </el-col>
@@ -554,11 +391,7 @@
     </el-dialog>
 
     <!--新增机床对话框-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
-=======
-    <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
         <el-form-item label="设备型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
@@ -577,17 +410,10 @@
     </el-dialog>
 
     <!--营销经理选择-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
       <span>姓名：</span>
       <el-input v-model="name" clearable size="small" style="width: 200px"/>
       <el-button size="small" type="success" style="margin-left: 10px" icon="el-icon-search" @click="searchName">查询</el-button>
-=======
-    <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
-      <span>姓名：</span>
-      <el-input v-model="name" clearable size="small" style="width: 200px"/>
-      <el-button size="small" type="success" @click="searchName">查询</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <!--<span>责权省份：</span>-->
       <!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
       <!--<el-option-->
@@ -597,11 +423,7 @@
       <!--:value="item.value"/>-->
       <!--</el-select>-->
       <div style="margin-top: 15px">
-<<<<<<< HEAD
         <el-table :data="tableData3" border stripe style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
-=======
-        <el-table :data="tableData3" border style="width: 100%; text-align: center;" size="mini" highlight-current-row @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -621,11 +443,7 @@
     </el-dialog>
 
     <!--投标保证金选择-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
-=======
-    <el-dialog :visible.sync="dialogFormVisibleBidding" title="请选择投标保证金" center width="65%">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <span>招标企业：</span>
       <el-input v-model="enterprise" size="small" style="width:200px" clearable/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchBidding">查询</el-button>
@@ -636,10 +454,7 @@
           style="width: 100%"
           height="400"
           border
-<<<<<<< HEAD
           stripe
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           size="mini"
           @row-click="biddingNum">
           <el-table-column align="center" label="招标企业" width="300">
@@ -694,11 +509,7 @@
     <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="800px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
-<<<<<<< HEAD
       <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" stripe border show-overflow-tooltip style="height: 330px; margin-top: 10px" size="mini" @row-click="handleCustomerChange">
-=======
-      <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" size="mini" @row-click="handleCustomerChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="省份" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.省份 }}
@@ -725,10 +536,7 @@
         :page-sizes="[10, 20, 30, 40]"
         :page-size="PageSize1"
         :total="total1"
-<<<<<<< HEAD
         style="margin-top: 10px"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange1"
         @current-change="handleCurrentChange1"/>
@@ -739,11 +547,7 @@
     </el-dialog>
 
     <!--改变节点时间对话框-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
-=======
-    <el-dialog :visible.sync="dialogTimeVisible" :show-close="false" :close-on-click-modal="false" title="进度完成时间" center style="min-height: 300px" width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form2" :model="form2" :rules="rules2" :disabled="disabledTime" label-width="140px">
         <el-form-item label="进度完成日期" prop="进度完成日期">
           <el-date-picker
@@ -1118,11 +922,7 @@ export default {
       this.addForm('form')
       this.dialogFormVisible1 = true
       this.temp = 1
-<<<<<<< HEAD
       this.title = '新增合同'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.disabled = false
       this.biddingNumber = ''
       this.tableDataBidding = []
@@ -1162,11 +962,7 @@ export default {
     },
     handleEdit(row) {
       this.editForm(row, 'form')
-<<<<<<< HEAD
       this.title = '编辑合同'
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.form.contractSigningDate = row.合同签订日期
       this.form.contractNumber = row.合同编号
@@ -1324,21 +1120,13 @@ export default {
     addMachine(row) {
       this.projectNum = row.项目流水号
       this.dialogFormVisible2 = true
-<<<<<<< HEAD
       this.title1 = '新增机床'
-=======
-      this.title1 = '新增'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.addForm('form1')
     },
     editMachine(row) {
       this.editForm(row, 'form1')
       this.dialogFormVisible2 = true
-<<<<<<< HEAD
       this.title1 = '编辑机床'
-=======
-      this.title1 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.c = row.机床流水号
       this.form1.设备型号 = row.机床图号
       this.form1.设备名称 = row.机床名称
@@ -1490,15 +1278,9 @@ export default {
   }
 }
 </script>
-<<<<<<< HEAD
 <style scoped>
   .el-table--scrollable-y .el-table__body-wrapper {overflow: hidden !important}
   .el-table--scrollable-x .el-table__body-wrapper {overflow: hidden !important}
-=======
-
-<style scoped>
-
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 .el-date-editor{
   width:200px;
 }
@@ -1530,11 +1312,7 @@ export default {
 }
 .delete:hover{
   background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
-<<<<<<< HEAD
   color: #ff0511;
-=======
-  color: #fff;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 a{
   text-decoration: none;
@@ -1560,7 +1338,6 @@ a{
   border: 1px solid black!important;
 }
 </style>
-<<<<<<< HEAD
 <style lang="scss">
   .subTableHeader {
     th {
@@ -1577,5 +1354,3 @@ a{
     }
   }
 </style>
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 1c32b9ac..a1a1a6f4 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -3,18 +3,13 @@
     <el-card>
       <div>
         <span>项目名称：</span>
-<<<<<<< HEAD
         <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="margin-top: 3px">
-=======
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-option
             v-for="item in entryName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
         <span style="margin-left: 10px">机床型号：</span>
         <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
       </div>
@@ -23,31 +18,14 @@
         <el-date-picker
           v-model="startTime"
           style="width: 200px;"
-=======
-        <span style="">机床型号：</span>
-        <el-input v-model="machine" clearable size="small" style="width:200px" placeholder="请输入机床型号"/>
-      </div>
-      <div style="margin-top: 20px">
-        <span style="margin-top: 20px">开始日期：</span>
-        <el-date-picker
-          v-model="startTime"
-          style="width: 205px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
           placeholder="请选择开始日期"/>
-<<<<<<< HEAD
         <span style="margin-left: 10px">结束日期：</span>
         <el-date-picker
           v-model="endTime"
           style="width: 200px;"
-=======
-        <span style="">结束日期：</span>
-        <el-date-picker
-          v-model="endTime"
-          style="width: 205px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           value-format="yyyy-MM-dd"
           size="small"
           type="date"
@@ -63,20 +41,12 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         style="width: 100%"
-<<<<<<< HEAD
         height="700"
         border
         stripe
         size="mini"
         @expand-change="selectMachine">
         <el-table-column type="expand" label="详情">
-=======
-        height="500"
-        border
-        size="mini"
-        @expand-change="selectMachine">
-        <el-table-column type="expand">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-table :data="tableData2" border style="width: 612px; text-align: center" size="mini">
               <el-table-column label="设备型号" align="center" width="150">
@@ -111,49 +81,29 @@
             </el-table>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同编号" width="150">
-=======
-        <el-table-column align="center" label="合同编号">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <template>
               <el-tag slot="reference">{{ scope.row.合同编号 }}</el-tag>
             </template>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="项目名称" width="150">
-=======
-        <el-table-column align="center" label="项目名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="项目下达日期" width="150">
-=======
-        <el-table-column align="center" label="项目下达日期">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同信息备注" width="150">
-=======
-        <el-table-column align="center" label="合同信息备注" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" align="center" width="350">
-=======
-        <el-table-column label="操作" fixed="right" align="center">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -198,10 +148,7 @@
               <el-date-picker
                 v-model="form.contractSigningDate"
                 style="width: 200px"
-<<<<<<< HEAD
                 format="yyyy-MM-dd"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 value-format="yyyy-MM-dd"
                 size="small"
                 type="date"
@@ -228,12 +175,9 @@
 
     <el-dialog :title="title1" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="450px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="140px">
-<<<<<<< HEAD
         <el-form-item v-show="flag != 2" label="项目名称" prop="项目名称">
           <el-input v-model="form1.项目名称" size="small" style="width:200px"/>
         </el-form-item>
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-form-item label="设备型号" prop="设备型号">
           <el-input v-model="form1.设备型号" size="small" placeholder="请输入设备型号" style="width:200px"/>
         </el-form-item>
@@ -254,10 +198,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-<<<<<<< HEAD
 import { getNowTime } from '@/utils/tool'
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 import { initProject, searchTable1, selectMachine, addList, editchar, delList, submitMachine, editMachine, delMachine } from '@/api/MarketingCenter/CreateProject'
 export default {
   components: {
@@ -300,10 +241,7 @@ export default {
       dialogFormVisible2: false,
       title1: '',
       form1: {
-<<<<<<< HEAD
         项目名称: '',
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         设备型号: '',
         设备名称: '',
         机床数量: 1
@@ -368,14 +306,9 @@ export default {
     ADD() {
       this.addForm('form')
       this.dialogFormVisible1 = true
-<<<<<<< HEAD
       this.form.contractSigningDate = getNowTime()// new Date()
       this.temp = 1
       this.title = '新增项目'
-=======
-      this.temp = 1
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     // 提交添加或者修改
     submit(formName) {
@@ -409,11 +342,7 @@ export default {
     },
     handleEdit(row) {
       this.editForm(row, 'form')
-<<<<<<< HEAD
       this.title = '编辑项目'
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.form.contractSigningDate = row.合同签订日期
       this.form.contractNumber = row.合同编号
@@ -439,14 +368,9 @@ export default {
     addMachine(row) {
       this.projectNum = row.项目流水号
       this.dialogFormVisible2 = true
-<<<<<<< HEAD
       this.title1 = '新增机床'
       this.addForm('form1')
       this.form1.项目名称 = row.项目名称
-=======
-      this.title1 = '新增'
-      this.addForm('form1')
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     submitMachine() {
       function a() {
@@ -473,11 +397,7 @@ export default {
       this.flag = 2
       this.editForm(row, 'form1')
       this.dialogFormVisible2 = true
-<<<<<<< HEAD
       this.title1 = '编辑机床'
-=======
-      this.title1 = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.c = row.机床流水号
       this.form1.设备型号 = row.机床图号
       this.form1.设备名称 = row.机床名称
diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue
index 0c40d5eb..350855e5 100644
--- a/src/views/MarketingCenter/DeliveryApplication/index.vue
+++ b/src/views/MarketingCenter/DeliveryApplication/index.vue
@@ -3,11 +3,7 @@
     <el-card class="box-card">
       <div>
         <el-row>
-<<<<<<< HEAD
           <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
-=======
-          <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">增加</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" @click="function_InvoiceEdit">编辑</el-button>
           <el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" @click="function_InvoiceSave">保存</el-button>
           <el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" @click="function_InvoiceExamine">核准</el-button>
@@ -44,11 +40,7 @@
         <!--<el-button icon="el-icon-refresh" size="mini" @click="function_Refresh">刷新</el-button>-->
 
       </div>
-<<<<<<< HEAD
       <el-divider class="fengexian" content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show">  展开</el-button></el-divider>
-=======
-      <el-divider content-position="right"><el-button type="text" class="el-icon-caret-bottom" @click="show = !show">  展开</el-button></el-divider>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <div v-show="show" style="margin-top: 20px" class="transition-box">
         <el-collapse-transition>
           <div class="text item">
@@ -77,11 +69,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">车辆牌号：</span>
                 <el-input
@@ -106,11 +94,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">制单人：</span>
                 <el-input
@@ -135,11 +119,7 @@
                   size="mini"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">制单日期：</span>
                 <el-date-picker
@@ -159,11 +139,7 @@
                   placeholder="结束日期"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">核准日期：</span>
                 <el-date-picker
@@ -183,11 +159,7 @@
                   placeholder="结束日期"/>
               </el-col>
             </el-row>
-<<<<<<< HEAD
             <el-row style="margin-top: 5px">
-=======
-            <el-row style="margin-top: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-col :span="24">
                 <span style="width:80px;display:inline-block;">发货日期：</span>
                 <el-date-picker
@@ -312,11 +284,7 @@
         :data="tableData"
         highlight-current-row
         style="width: 100%"
-<<<<<<< HEAD
         height="560"
-=======
-        height="300"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         border
         size="mini">
         <el-table-column align="center" label="货品类别" width="80">
@@ -365,11 +333,7 @@
               :disabled="disabledDetailsDelete"
               size="mini"
               type="text"
-<<<<<<< HEAD
               icon="el-icon-delete"
-=======
-              icon="el-icon-delete-solid"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               @click.native.prevent="deleteRow(scope.$index, tableData)"
             >删除</el-button>
           </template>
@@ -498,10 +462,7 @@
               style="width: 100%"
               height="200"
               border
-<<<<<<< HEAD
               stripe
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini"
               @selection-change="handleSelectionChangeMachine">
               <el-table-column
@@ -617,11 +578,7 @@
               {{ scope.row.发货人 }}
             </template>
           </el-table-column>
-<<<<<<< HEAD
           <el-table-column align="center" label="制单时间" show-overflow-tooltip>
-=======
-          <el-table-column align="center" label="制单时间">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <template slot-scope="scope">
               {{ scope.row.操作日期 }}
             </template>
@@ -1245,22 +1202,15 @@ export default {
 </style>
 
 <style scoped>
-<<<<<<< HEAD
   .el-divider{
     margin: 5px;
   }
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   .text {
     font-size: 14px;
   }
 
   .item {
-<<<<<<< HEAD
     margin-bottom: 5px;
-=======
-    margin-bottom: 18px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 
   .clearfix:before,
@@ -1271,10 +1221,4 @@ export default {
   .clearfix:after {
     clear: both
   }
-<<<<<<< HEAD
-=======
-  .el-card{
-    margin-top: 2px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 670eeb87..f5dc4c14 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -3,22 +3,14 @@
     <!--查询条件-->
     <el-card>
       <span>项目名称：</span>
-<<<<<<< HEAD
       <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
-=======
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in entryName"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <span style="margin-left: 10px">营销经理：</span>
-=======
-      <span style="margin-left: 10px">销售经理：</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-input v-model="MarketingManagerValue" readonly clearable size="small" style="width:200px" placeholder="请双击选择营销经理" @dblclick.native="openName" @clear="clearPeople()"/>
       <span style="margin-left: 10px">开始日期：</span>
       <el-date-picker
@@ -44,7 +36,6 @@
         v-loading="listLoading1"
         :data="tableData1"
         highlight-current-row
-<<<<<<< HEAD
         style="width: 100%;margin-top: 3px"
         height="460"
         border
@@ -57,37 +48,16 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
-=======
-        style="width: 100%"
-        height="300"
-        border
-        size="mini"
-        @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" width="200">
-          <template slot-scope="scope">
-            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="付款方式" width="100">
-=======
-        <el-table-column align="center" label="付款方式" width="120">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.付款方式 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同签订日期" width="100">
-=======
-        <el-table-column align="center" label="合同签订日期" width="120">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
@@ -97,7 +67,6 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同总金额（含税）" width="130">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
@@ -108,27 +77,11 @@
           <template slot-scope="scope">
             <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="warning">无收款计划</el-tag>
             <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
-=======
-        <el-table-column align="center" label="合同总金额（含税）" width="150">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
-            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.合同总金额 }} </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="已到账金额" width="150">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="small" style="width: 80px" type="warning">无收款计划</el-tag>
-            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.已支付 }} </el-tag>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
         <el-table-column align="center" label="税率" width="100">
           <template slot-scope="scope">
-<<<<<<< HEAD
             <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" class="tableInput" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
-=======
-            <el-input :disabled="scope.row.是是否禁用税率编辑" v-model="scope.row.税率" size="mini" style="width:70px" placeholder="请填写税率" @click.native="unlockEditor(scope.row)" @blur="lockEditor(scope.row)" @change="revisionOfTaxRate(scope.row)"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
         <el-table-column align="center" label="合同信息备注">
@@ -140,31 +93,20 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-<<<<<<< HEAD
               type="text"
-=======
-              type="primary"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               icon="el-icon-circle-plus-outline"
               @click.stop="openAddInvoiceRecordingDialog(scope.row); flag = 1">新增记录</el-button>
           </template>
         </el-table-column>
       </el-table>
-<<<<<<< HEAD
       <div class="block">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
           :page-size="PageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
-<<<<<<< HEAD
           style="margin: 3px"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
       </div>
@@ -176,28 +118,18 @@
         :data="tableData2"
         :summary-method="getSummaries"
         show-summary
-<<<<<<< HEAD
         style="width: 100%;margin-top: 3px"
         height="300"
         highlight-current-row
         border
         stripe
-=======
-        style="width: 100%"
-        height="320"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         size="mini">
         <el-table-column
           align="center"
           label="序号"
           type="index"
           width="50"/>
-<<<<<<< HEAD
         <el-table-column align="center" label="发票抬头" width="200" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="发票抬头" width="180">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
@@ -227,20 +159,12 @@
             {{ scope.row.银行账号 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="开票金额（含税）" width="120">
-=======
-        <el-table-column align="center" label="开票金额（含税）" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.开票金额 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="开票时间" width="100">
-=======
-        <el-table-column align="center" label="开票时间" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.开票时间 }}
           </template>
@@ -250,7 +174,6 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -272,20 +195,6 @@
                   @click.stop="delInvoiceRecordingDialog(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="warning"
-              icon="el-icon-edit"
-              @click.stop="openEditInvoiceRecordingDialog(scope.row); flag = 2">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="delInvoiceRecordingDialog(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
@@ -295,11 +204,7 @@
     <el-dialog :visible.sync="dialogFormVisiblePeople" title="营销经理" center width="500px">
       <span>姓名：</span>
       <el-input v-model="name" clearable size="small" style="width: 200px"/>
-<<<<<<< HEAD
       <el-button size="small" type="success" style="margin-left: 10px;" icon="el-icon-search" @click="searchName">查询</el-button>
-=======
-      <el-button size="small" type="success" @click="searchName">查询</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <!--<span>责权省份：</span>-->
       <!--<el-select v-model="ProvinceValue" clearable filterable placeholder="请选择省份" style="margin-right: 10px" size="small" @change="changeProvince">-->
       <!--<el-option-->
@@ -308,13 +213,8 @@
       <!--:label="item.label"-->
       <!--:value="item.value"/>-->
       <!--</el-select>-->
-<<<<<<< HEAD
       <div style="margin-top: 5px">
         <el-table :data="dataPeople" border size="mini" stripe style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
-=======
-      <div style="margin-top: 15px">
-        <el-table :data="dataPeople" border style="width: 100%; text-align: center;" highlight-current-row @row-click="handleChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-table-column label="销售经理" align="center" >
             <template slot-scope="scope">
               {{ scope.row.姓名 }}
@@ -401,27 +301,16 @@
       </div>
     </el-dialog>
     <!--客户选择-->
-<<<<<<< HEAD
     <el-dialog :visible.sync="dialogCustomerFormVisible" title="选择客户" center width="600px">
       <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
       <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
       <el-table v-loading="loading1" :data="CustomerData" border stripe size="mini" highlight-current-row height="400" show-overflow-tooltip style="height: 330px; margin-top: 5px" @row-click="handleCustomerChange">
-=======
-    <el-dialog :visible.sync="dialogCustomerFormVisible" title="客户选择" center width="600px">
-      <el-input v-model="Customer" clearable size="small" style="width:200px" placeholder="请输入客户名称"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize1 = 30;PageCurrent1 = 1;fetchCustomerData()">查询</el-button>
-      <el-table v-loading="loading1" :data="CustomerData" highlight-current-row height="300" show-overflow-tooltip style="height: 330px; margin-top: 20px" @row-click="handleCustomerChange">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="省份" align="center" width="80">
           <template slot-scope="scope">
             {{ 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>
@@ -442,10 +331,7 @@
         :page-sizes="[10, 20, 30, 40]"
         :page-size="PageSize1"
         :total="total1"
-<<<<<<< HEAD
         style="margin-top: 10px"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         layout="total, sizes, prev, pager, next, jumper"
         @size-change="handleSizeChange1"
         @current-change="handleCurrentChange1"/>
@@ -544,13 +430,9 @@ export default {
     },
     openName() {
       this.name = ''
-<<<<<<< HEAD
       SelectMarketingManager(this.name).then(response => {
         this.dataPeople = response.data
       })
-=======
-      this.dataPeople = []
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisiblePeople = true
     },
     // 初始化条件
@@ -690,19 +572,12 @@ export default {
       this.timetime = row.合同签订日期
       this.changeTime()
       this.addForm('form')
-<<<<<<< HEAD
       this.title = '增加开票记录'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
     },
     // 打开选择
     CustomerChange() {
-<<<<<<< HEAD
       this.fetchCustomerData()
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogCustomerFormVisible = true
     },
     offCustomerChange() {
@@ -776,11 +651,7 @@ export default {
     },
     openEditInvoiceRecordingDialog(row) {
       this.editForm(row, 'form')
-<<<<<<< HEAD
       this.title = '编辑开票记录'
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.CustomerCode = row.客户流水号
       this.form.客户名称 = row.客户名称
@@ -828,15 +699,10 @@ export default {
 }
 </script>
 
-<<<<<<< HEAD
 <style lang="scss">
   /*.tableInput{*/
   /*  .el-textarea__inner, .el-radio__inner, .el-input__inner{*/
   /*    border: 1px solid #F56C6C !important*/
   /*  }*/
   /*}*/
-=======
-<style scoped>
-
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 10679b68..49e18931 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -2,11 +2,7 @@
   <div>
     <el-card>
       <span>项目名称：</span>
-<<<<<<< HEAD
       <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin: 3px" size="small" clearable>
-=======
-      <el-select v-model="entryNameValue" filterable placeholder="项目名称" style="margin-right: 10px" size="small" clearable>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in entryName"
           :key="item.value"
@@ -36,7 +32,6 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
-<<<<<<< HEAD
         style="width: 100%;margin-top: 3px;"
         height="600"
         border
@@ -50,20 +45,6 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="150" show-overflow-tooltip>
-=======
-        style="width: 100%"
-        height="400"
-        border
-        size="mini"
-        highlight-current-row
-        @row-click="fetchTableData2">
-        <el-table-column align="center" label="合同编号" width="200">
-          <template slot-scope="scope">
-            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -73,47 +54,27 @@
             {{ scope.row.执行进度名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同签订日期" width="100">
-=======
-        <el-table-column align="center" label="合同签订日期">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="销售经理" width="90">
-=======
-        <el-table-column align="center" label="销售经理" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="客户名称" width="200" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系人" width="80" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系人" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="130" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系电话" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
@@ -123,40 +84,24 @@
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="300px">
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="260px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用增加履约保证金"
               size="mini"
-<<<<<<< HEAD
               type="text"
-=======
-              type="primary"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               icon="el-icon-circle-plus-outline"
               @click.stop="openPerformanceBondDialog(scope.row); flag = 1">履约保证金</el-button>
             <el-button
               :disabled="scope.row.是否禁用增加履约保函"
               size="mini"
-<<<<<<< HEAD
               type="text"
-=======
-              type="primary"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               icon="el-icon-circle-plus-outline"
               @click.stop="addPerformanceGuarantee(scope.row)">履约保函</el-button>
           </template>
         </el-table-column>
       </el-table>
-<<<<<<< HEAD
       <div class="block" style="margin-top: 3px;">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrent"
           :page-sizes="[10, 20, 30, 40]"
@@ -169,23 +114,14 @@
     </el-card>
     <el-card>
       <template>
-<<<<<<< HEAD
         <el-tabs v-model="activeName" type="card" style="margin: 0px">
-=======
-        <el-tabs v-model="activeName" type="card">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-tab-pane :disabled="performanceBondDisabled" label="履约保证金" name="first">
             <el-table
               v-loading="listLoading2"
               :data="tableData2"
               highlight-current-row
-<<<<<<< HEAD
               style="width: 100%;margin-top: 3px;"
               height="130"
-=======
-              style="width: 100%"
-              height="100"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               border
               size="mini">
               <el-table-column align="center" label="履约保证金金额">
@@ -243,7 +179,6 @@
                   </el-popover>
                 </template>
               </el-table-column>
-<<<<<<< HEAD
               <el-table-column label="操作" fixed="right" align="center" width="200px">
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" content="收回" placement="top">
@@ -278,36 +213,13 @@
                         @click.stop="delPerformanceBond(scope.row)"/>
                     </div>
                   </el-tooltip>
-=======
-              <el-table-column label="操作" fixed="right" align="center" width="260px">
-                <template slot-scope="scope">
-                  <el-button
-                    :disabled="scope.row.是否禁用收回"
-                    size="mini"
-                    type="success"
-                    @click.stop="takeBack(scope.row)">收回</el-button>
-                  <el-button
-                    :disabled="scope.row.是否禁用编辑"
-                    size="mini"
-                    type="warning"
-                    @click.stop="openEditPerformanceBondDialog(scope.row); flag = 2">编辑</el-button>
-                  <el-button
-                    :disabled="scope.row.是否禁用删除"
-                    size="mini"
-                    type="danger"
-                    @click.stop="delPerformanceBond(scope.row)">删除</el-button >
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 </template>
               </el-table-column>
             </el-table>
           </el-tab-pane>
           <el-tab-pane :disabled="performanceGuaranteeDisabled" label="履约保函" name="second">
             <div v-show="performanceGuaranteeShow">
-<<<<<<< HEAD
               <el-button type="danger" icon="el-icon-delete" plain size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
-=======
-              <el-button type="danger" icon="el-icon-delete" size="small" style="float: right;display: inline-block" @click="delPerformanceGuarantee">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <div style="width: 150px; height: 150px; margin: auto;left: 50%;right: 50%">
                 <el-upload
                   :on-preview="handlePictureCardPreview"
@@ -616,11 +528,7 @@ export default {
     },
     openPerformanceBondDialog(row) {
       this.addForm('form2')
-<<<<<<< HEAD
       this.title1 = '新增履约保证金'
-=======
-      this.title1 = '增加履约保证金'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.projectId = row.项目流水号
       this.tableData2 = []
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index 52dd22dc..72a70f88 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -3,11 +3,7 @@
     <!--顶栏结构-->
     <el-card>
       <span>项目名称：</span>
-<<<<<<< HEAD
       <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin:3px;">
-=======
-      <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称:" size="small" style="margin-left: 10px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in entryName"
           :key="item.value"
@@ -37,7 +33,6 @@
       <el-table
         v-loading="listLoadingProject"
         :data="projectTableData"
-<<<<<<< HEAD
         style="width: 100%;margin-top: 3px;"
         height="650"
         border
@@ -51,20 +46,6 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" width="160" show-overflow-tooltip>
-=======
-        style="width: 100%"
-        height="400"
-        border
-        size="mini"
-        highlight-current-row
-        @row-click="fetchTableData1">
-        <el-table-column align="center" label="合同编号" width="200">
-          <template slot-scope="scope">
-            <el-tag type="primary">{{ scope.row.合同编号 }}</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="项目名称" width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
           </template>
@@ -74,85 +55,49 @@
             {{ scope.row.执行进度名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同签订日期" width="130">
-=======
-        <el-table-column align="center" label="合同签订日期">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同签订日期 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="销售经理" width="100">
-=======
-        <el-table-column align="center" label="销售经理" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="客户名称" width="250" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="客户名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.客户名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系人" width="100" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系人" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.联系人 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="联系电话" width="150" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="联系电话" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.电话 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="合同信息备注" >
-=======
-        <el-table-column align="center" label="合同信息备注">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150px">
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="125px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-button
               :disabled="scope.row.是否禁用增加安全保证金"
               size="mini"
-<<<<<<< HEAD
               type="text"
-=======
-              type="primary"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               icon="el-icon-circle-plus-outline"
               @click.stop="addSafetyMargin(scope.row);flag1 = 1">安全保证金
             </el-button>
           </template>
         </el-table-column>
       </el-table>
-<<<<<<< HEAD
       <div class="block" style="margin-top: 3px;">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="PageCurrentProject"
           :page-sizes="[10, 20, 30, 40]"
@@ -166,22 +111,13 @@
 
     <!--安全保证金表格-->
     <el-card>
-<<<<<<< HEAD
-=======
-      <span style="float: right; margin-bottom: 15px">安全保证金记录</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table
         v-loading="tableData1Loading"
         :data="tableData1"
         style="width: 100%"
-<<<<<<< HEAD
         highlight-current-row
         border
         stripe
-=======
-        height="79"
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         size="mini"
         @row-click="fetchTableData2">
         <!--<el-table-column align="center" label="项目名称" width="300">-->
@@ -273,7 +209,6 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="200">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="收回" placement="top">
@@ -319,34 +254,6 @@
                   @click.stop="delSafetyMargin(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="370">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="scope.row.是否禁用收回"
-              size="mini"
-              type="success"
-              icon="el-icon-edit"
-              @click.stop="TakeBack(scope.row);flag1 = 5">收回</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用扣款"
-              size="mini"
-              type="info"
-              icon="el-icon-edit"
-              @click.stop="Withdrawing(scope.row);flag1 = 3">扣款</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用编辑"
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="editSafetyMargin(scope.row);flag1 = 2">编辑</el-button>
-            <el-button
-              :disabled="scope.row.是否禁用删除"
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="delSafetyMargin(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
@@ -361,72 +268,9 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
-<<<<<<< HEAD
 
     <!--新增编辑保证金信息对话框-->
     <el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
-=======
-    <!--扣款记录表格-->
-    <el-card>
-      <span style="float: right; margin-bottom: 15px">扣款记录</span>
-      <el-table
-        v-loading="tableData2Loading"
-        :data="tableData2"
-        style="width: 100%;margin-top: 15px"
-        height="230"
-        border
-        size="mini">
-        <el-table-column align="center" label="扣款金额">
-          <template slot-scope="scope">
-            {{ scope.row.扣款金额 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="被扣款人">
-          <template slot-scope="scope">
-            {{ scope.row.被扣款人 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="扣款原因">
-          <template slot-scope="scope">
-            {{ scope.row.扣款原因 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="扣款日期">
-          <template slot-scope="scope">
-            {{ scope.row.扣款日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="disabled"
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click.stop="editWithdrawing(scope.row);flag1 = 4">编辑</el-button>
-            <el-button
-              :disabled="disabled"
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click.stop="delWithdrawing(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block" style="margin-top: 10px;">
-        <el-pagination
-          :current-page="PageCurrent2"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="PageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-    <!--新增编辑保证金信息对话框-->
-    <el-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form" :model="form" :rules="rules1" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -491,11 +335,7 @@
     </el-dialog>
 
     <!--扣款记录增加-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="800px">
-=======
-    <el-dialog :title="title2" :visible.sync="dialogFormVisible2" center style="min-height: 300px" width="800px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -548,11 +388,7 @@
     </el-dialog>
 
     <!--扣款记录编辑-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="编辑" center style="min-height: 300px" width="800px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible3" title="编辑" center style="min-height: 300px" width="800px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="12">
@@ -600,11 +436,7 @@
     </el-dialog>
 
     <!--收回安全保证金-->
-<<<<<<< HEAD
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="20%">
-=======
-    <el-dialog :visible.sync="dialogFormVisible4" title="收回" center style="min-height: 300px" width="20%">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-form ref="form4" :model="form4" :rules="rules4" label-position="left" label-width="120px" class="demo-ruleForm">
         <el-form-item label="项目名称" prop="项目名称">
           <el-input v-model="projectName" size="small" placeholder="请输入项目名称" style="width:200px" disabled/>
@@ -628,7 +460,6 @@
         <el-button type="primary" @click="submit1('form4')">确 定</el-button>
       </div>
     </el-dialog>
-<<<<<<< HEAD
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible5" title="扣款" center style="min-height: 300px" width="800px">
       <!--扣款记录表格-->
@@ -691,8 +522,6 @@
         </div>
       </el-card>
     </el-dialog>
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   </div>
 </template>
 
@@ -759,10 +588,7 @@ export default {
       dialogFormVisible2: false,
       dialogFormVisible3: false,
       dialogFormVisible4: false,
-<<<<<<< HEAD
       dialogFormVisible5: false,
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       form: {
         备注: '',
         项目名称: '',
@@ -903,10 +729,7 @@ export default {
       this.SurplusAmount = row.应收回金额
       this.projectName = row.项目名称
       this.getTable(searchTable2, [this.PageCurrent2, this.PageSize2, this.code], ['tableData2', 'total2', 'tableData2Loading'])
-<<<<<<< HEAD
       this.dialogFormVisible5 = true
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     handleSizeChange(val) {
       this.PageCurrent = 1
@@ -931,11 +754,7 @@ export default {
       this.fetchTableData2()
     },
     addSafetyMargin(row) {
-<<<<<<< HEAD
       this.title = '新增安全保证金'
-=======
-      this.title = '增加'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.timetime = row.合同签订日期
       this.changeTime()
       this.dialogFormVisible1 = true
@@ -944,11 +763,7 @@ export default {
     },
     editSafetyMargin(row) {
       this.editForm(row, 'form')
-<<<<<<< HEAD
       this.title = '编辑安全保证金'
-=======
-      this.title = '编辑'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.form.保证金金额 = row.保证金金额
       this.form.交付日期 = row.交付日期
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
index 6e545f17..20784f3a 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
+++ b/src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js
@@ -1,12 +1,7 @@
 /* eslint-disable */
 require('script-loader!file-saver');
-<<<<<<< HEAD
-// import XLSX from 'xlsx'
-import XLSX from 'xlsx-style'
-=======
 import XLSX from 'xlsx'
 
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 function generateArray(table) {
   var out = [];
   var rows = table.querySelectorAll('tr');
@@ -150,76 +145,6 @@ export function export_table_to_excel(id) {
 }
 
 export function export_json_to_excel({
-<<<<<<< HEAD
-  headerGroup,
-  dataGroup,
-  sheetGroup,
-  filename,
-  autoWidth = true,
-  bookType=  'xlsx'
-} = {}) {
-  var wb = new Workbook()
-  for (let i = 0; i < dataGroup.length; i++) {
-    /* original data */
-    let data = dataGroup[i]
-    filename = filename || 'excel-list'
-    data = [...data]
-    data.unshift(headerGroup[i]);
-    var ws_name = sheetGroup[i];
-    var ws = sheet_from_array_of_arrays(data);
-
-    if (autoWidth) {
-      /*设置worksheet每列的最大宽度*/
-      const colWidth = data.map(row => row.map(val => {
-        /*先判断是否为null/undefined*/
-        if (val == null) {
-          return {
-            'wch': 10
-          };
-        }
-        /*再判断是否为中文*/
-        else if (val.toString().charCodeAt(0) > 255) {
-          return {
-            'wch': val.toString().length * 2
-          };
-        } else {
-          return {
-            'wch': val.toString().length
-          };
-        }
-      }))
-      /*以第一行为初始值*/
-      let result = colWidth[0];
-      for (let i = 1; i < colWidth.length; i++) {
-        for (let j = 0; j < colWidth[i].length; j++) {
-          if (result[j]['wch'] < colWidth[i][j]['wch']) {
-            result[j]['wch'] = colWidth[i][j]['wch'];
-          }
-        }
-      }
-      ws['!cols'] = result;
-    }
-    let R = 0;
-    data.map(item => {
-      let C = 0;
-      item.map(itm => {
-        var cell_ref = XLSX.utils.encode_cell({c:C,r:R});
-        var cell = {v: itm }
-        cell.s= {
-          alignment: {
-            horizontal: "center"
-          }
-        }
-        ws[cell_ref] = cell;
-        C++;
-      })
-      R++;
-    })
-    /* add worksheet to workbook */
-    wb.SheetNames.push(ws_name);
-    wb.Sheets[ws_name] = ws;
-  }
-=======
   multiHeader = [],
   header,
   data,
@@ -284,7 +209,6 @@ export function export_json_to_excel({
   wb.SheetNames.push(ws_name);
   wb.Sheets[ws_name] = ws;
 
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   var wbout = XLSX.write(wb, {
     bookType: bookType,
     bookSST: false,
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index c2a323f2..86e91a88 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -706,13 +706,6 @@
     <el-dialog :visible.sync="dialogVisible2" :title="title2" center style="min-height: 300px" width="400px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="90px">
         <el-form-item label="询价单号" prop="inquirySheetNum">
-<<<<<<< HEAD
-          <el-input v-model="form2.inquirySheetNum" size="small"/>
-        </el-form-item>
-        <el-form-item label="供应商" prop="supplierName">
-          <el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true;enterpriseNature = '';createDate = '';registeredCapital = '';taxNum = '';EMail = '';address = '';account = '';openingBank = '';phone = '';fax = '';goodTime = ''"/>
-        </el-form-item>
-=======
           <el-input v-model="form2.inquirySheetNum" readonly size="small"/>
         </el-form-item>
         <el-form-item label="供应商" prop="supplierNameValue">
@@ -727,7 +720,6 @@
         <!--<el-form-item label="供应商" prop="supplierName">-->
         <!--<el-input v-model="form2.supplierName" size="small" readonly @focus="dialogVisible1=true;enterpriseNature = '';createDate = '';registeredCapital = '';taxNum = '';EMail = '';address = '';account = '';openingBank = '';phone = '';fax = '';goodTime = ''"/>-->
         <!--</el-form-item>-->
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2=false">取消</el-button>
@@ -735,11 +727,7 @@
           v-show="title2==='创建询价单'"
           type="primary"
           size="small"
-<<<<<<< HEAD
-          @click="submitCreateInquirySheet">确定</el-button>
-=======
           @click="submitCreateInquirySheet1">确定</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-button
           v-show="title2==='编辑询价单'"
           type="primary"
@@ -878,11 +866,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
-=======
 import { getBillNum, searchMaterial, searchPart, searchSupplier, searchCreateInquirySheet, searchCreateInquirySheet2, searchSheetDetail, editInquirySheet,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   createInquirySheet, deleteInquirySheet, addInquirySheet1, addInquirySheet2, outInquirySheet, searchAllMaterial, materialChange, saveOrder,
   submitUseInventory, initProject, searchMachine, searchGroup, searchBaseInfo, editBaseInfo, getExport1, getExport2, searchMerge } from '@/api/PurchasingCenter/CreateInquirySheet'
 import { mapGetters } from 'vuex'
@@ -894,10 +878,7 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
-<<<<<<< HEAD
-=======
       supplierNames: [], // 供应商下拉框
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       switchValue: false, // 物料变更列显示开关
       source: [
         {
@@ -1021,13 +1002,6 @@ export default {
         inquirySheetNumValue: '', // 询价单流水号
         inquirySheetNum: '',
         supplierName: '',
-<<<<<<< HEAD
-        supplierValue: ''
-      },
-      rules2: { // 表单验证规则
-        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
-        supplierName: [{ required: true, message: '请选择供应商' }]
-=======
         supplierValue: '',
         supplierNameValue: ''
       },
@@ -1035,7 +1009,6 @@ export default {
         inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
         supplierName: [{ required: true, message: '请选择供应商' }],
         supplierNameValue: [{ required: true, message: '请选择供应商', trigger: 'change' }]
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       },
       groupPartNum: [], // 组件零件流水号
       groupPartBasicNum: [], // 组件零件基本件流水号
@@ -1323,8 +1296,6 @@ export default {
           })
         }
       })
-<<<<<<< HEAD
-=======
       searchSupplier(0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '', 0, '').then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.supplierNames.push({
@@ -1333,7 +1304,6 @@ export default {
           })
         }
       })
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     projectChange() {
       this.machine = []
@@ -1510,21 +1480,11 @@ export default {
       this.pageCurrent2 = val
       this.searchTable2()
     },
-<<<<<<< HEAD
-    createInquirySheet() { // 创建空单据--询价单
-=======
     createInquirySheet() { // 创建空单据--询价单9745
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       if (this.$refs['form2'] !== undefined) {
         this.$refs['form2'].resetFields()
       }
       this.title2 = '创建询价单'
-<<<<<<< HEAD
-      this.form2.inquirySheetNum = ''
-      this.form2.supplierValue = ''
-      this.form2.supplierName = ''
-      this.dialogVisible2 = true
-=======
       getBillNum().then(response => { // 查询询价单号
         this.form2.inquirySheetNum = response.data[0].单号
         this.form2.supplierValue = ''
@@ -1532,7 +1492,6 @@ export default {
         this.form2.supplierName = ''
         this.dialogVisible2 = true
       })
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     submitCreateInquirySheet() { // 提交创建询价单
       this.$refs['form2'].validate((valid) => {
@@ -1546,11 +1505,7 @@ export default {
             if (numGroup1.indexOf(this.form2.inquirySheetNum) !== -1) {
               this.$message.error('该询价单号已存在')
             } else {
-<<<<<<< HEAD
-              createInquirySheet(this.form2.inquirySheetNum, this.form2.supplierValue, '', this.id).then(response => {
-=======
               createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierValue, '').then(response => {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                 if (response.data[0].result === '1') {
                   this.$message.success('创建成功')
                   this.inquirySheetNum = ''
@@ -1568,8 +1523,6 @@ export default {
         }
       })
     },
-<<<<<<< HEAD
-=======
     submitCreateInquirySheet1() { // 提交创建询价单
       this.$refs['form2'].validate((valid) => {
         if (valid) {
@@ -1588,7 +1541,6 @@ export default {
         }
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     deleteInquirySheet(row) { // 删除询价单
       this.$confirm('确定删除该询价单?', '提示', {
         confirmButtonText: '确定',
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 81e9ded9..1f0569c1 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -135,21 +135,13 @@
         </el-table-column>
         <el-table-column v-show="hasTax==='未税'" label="单价（未税）" align="center" width="120">
           <template slot-scope="scope">
-<<<<<<< HEAD
-            <el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
-=======
             <el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='未税'" v-model="scope.row.未税单价" size="mini" style="width:100%" @keyup.native="scope.row.未税单价 = scope.row.未税单价.replace(/[^\.\d]/g,'')" @change="priceChange(scope.row.未税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <b v-show="hasTax!=='未税'">—</b>
           </template>
         </el-table-column>
         <el-table-column v-show="hasTax==='含税'" label="单价（含税）" align="center" width="120">
           <template slot-scope="scope">
-<<<<<<< HEAD
-            <el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:100%" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
-=======
             <el-input v-direction="{x: 0, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.含税单价" size="mini" style="width:100%" @keyup.native="scope.row.含税单价 = scope.row.含税单价.replace(/[^\.\d]/g,'')" @change="priceChange(scope.row.含税单价, scope.row.物料流水号, scope.row.询价单流水号, scope.row, scope.row.零件名称, scope.row.零件图号, scope.row.规格)"/>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             <b v-show="hasTax!=='含税'">—</b>
           </template>
         </el-table-column>
@@ -701,11 +693,7 @@ export default {
           }
           const merge = []
           this.tableData1.map(v => {
-<<<<<<< HEAD
-            if ((this.hasTax === '含税' && Number(v.含税单价)) || (this.hasTax === '未税' && Number(v.未税单价))) { // 筛掉未询到价格的物料
-=======
             if ((this.hasTax === '含税' && v.含税单价.trim() !== '') || (this.hasTax === '未税' && v.未税单价.trim() !== '')) { // 筛掉未询到价格的物料
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               merge.push({
                 机床图号: v.机床图号,
                 组号: v.组号,
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index eef55496..c5eb128a 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -221,23 +221,6 @@
               <el-input v-model="form1.remark" size="small" placeholder="备注"/>
             </el-form-item>
           </el-col>
-<<<<<<< HEAD
-          <b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>
-          <el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">
-            <el-upload
-              id="invoiceScan"
-              ref="upload"
-              :auto-upload="false"
-              :on-success="uploadSuccess"
-              :before-upload="beforeUpload"
-              :on-exceed="warningExceed"
-              :limit="limit"
-              :action="upload+'?invoiceNum='+form1.invoiceNum+'&money='+form1.money+'&supplierValue='+form1.supplierValue+'&paid='+form1.paid+'&unpaid='+form1.unpaid+'&tax='+form1.tax+'&isCost='+form1.isCost+'&remark='+form1.remark+'&personId='+id"
-              list-type="picture-card">
-              <i class="el-icon-plus"/>
-            </el-upload>
-          </el-form-item>
-=======
           <!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
           <!--<el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">-->
           <!--<el-upload-->
@@ -253,7 +236,6 @@
           <!--<i class="el-icon-plus"/>-->
           <!--</el-upload>-->
           <!--</el-form-item>-->
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -334,18 +316,10 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
-  addTable2, deleteTable2 } from '@/api/PurchasingCenter/InvoiceSettlementApplication'
-import { mapGetters } from 'vuex'
-import { uploadInvoiceScan, readFile } from '@/utils/request'
-import request from '@/utils/request'
-=======
 import { insertInto, searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
   addTable2, deleteTable2 } from '@/api/PurchasingCenter/InvoiceSettlementApplication'
 import { mapGetters } from 'vuex'
 import { uploadInvoiceScan } from '@/utils/request'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   name: '', // 发票结算申请
   data() {
@@ -453,11 +427,6 @@ export default {
     submitAdd1() { // 提交新增
       this.$refs['form1'].validate((valid) => {
         if (valid) {
-<<<<<<< HEAD
-          this.$refs.upload.submit() // 上传图片
-        } else {
-          console.log('error submit!!')
-=======
           insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
@@ -468,7 +437,6 @@ export default {
             }
           })
         } else {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -486,10 +454,6 @@ export default {
             } else { this.$message.error('编辑失败') }
           })
         } else {
-<<<<<<< HEAD
-          console.log('error submit!!')
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -531,20 +495,7 @@ export default {
         })
       })
     },
-<<<<<<< HEAD
-    async searchPic(row, i) {
-      const { data } = await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
-        }
-      })
-      this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
-=======
     searchPic(row, i) {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     warningExceed() {
       this.$message.error('仅可上传一张发票')
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index de97faf2..3f4517fe 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -2,21 +2,13 @@
   <div class="app-container">
     <el-card>
       <el-row>
-<<<<<<< HEAD
         <el-col style="width: 280px;margin-top: 3px">
-=======
-        <el-col style="width: 280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>物料类别:</span>
           <el-select
             v-model="MaterialCategoryValue"
             placeholder="请选择"
             size="small"
             clearable
-<<<<<<< HEAD
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             @change="searchMaterialVariety">
             <el-option
               v-for="item in MaterialCategory"
@@ -25,21 +17,13 @@
               :value="item.value"/>
           </el-select>
         </el-col>
-<<<<<<< HEAD
         <el-col style="width: 280px;margin-top: 3px">
-=======
-        <el-col style="width: 280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>物料品种:</span>
           <el-select
             v-model="MaterialVarietyValue"
             placeholder="请选择"
             size="small"
             clearable
-<<<<<<< HEAD
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             @change="searchMaterial">
             <el-option
               v-for="item in MaterialVariety"
@@ -48,58 +32,32 @@
               :value="item.value"/>
           </el-select>
         </el-col>
-<<<<<<< HEAD
         <el-col style="width: 280px;margin-top: 3px">
           <span>物料名称:</span>
           <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
         </el-col>
         <el-col style="width: 280px;margin-top: 3px">
-=======
-        <el-col style="width: 280px">
-          <span>物料名称:</span>
-          <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="margin-bottom: 10px;"/>
-        </el-col>
-        <el-col style="width: 280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>物料全称:</span>
           <el-input
             v-model="FullNameOfMaterial"
             placeholder="物料全称"
             size="small"
-<<<<<<< HEAD
             clearable/>
         </el-col>
         <el-col style="width: 280px;margin-top: 3px">
-=======
-            style="margin-bottom: 10px;"
-            clearable/>
-        </el-col>
-        <el-col style="width: 280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>物料规格:</span>
           <el-input
             v-model="MaterialSpecification"
             placeholder="物料规格"
             size="small"
-<<<<<<< HEAD
             clearable/>
         </el-col>
         <el-col style="width: 280px;margin-top: 3px">
-=======
-            style="margin-bottom: 10px;"
-            clearable/>
-        </el-col>
-        <el-col style="width: 280px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>物料型号:</span>
           <el-input
             v-model="MaterialModel"
             placeholder="物料型号"
             size="small"
-<<<<<<< HEAD
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             clearable/>
         </el-col>
         <el-col style="width: 280px">
@@ -107,11 +65,7 @@
           <el-select
             v-model="MeasurementUnitValue"
             placeholder="请选择"
-<<<<<<< HEAD
             style="margin-bottom: 3px;margin-top: 10px"
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             size="small"
             clearable>
             <el-option
@@ -126,11 +80,7 @@
           <el-select
             v-model="MaterialSourceValue"
             placeholder="请选择"
-<<<<<<< HEAD
             style="margin-bottom: 3px;margin-top: 10px"
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             size="small"
             clearable>
             <el-option
@@ -146,11 +96,7 @@
             v-model="supplier"
             placeholder="供货商"
             size="small"
-<<<<<<< HEAD
             style="margin-bottom: 3px;margin-top: 10px"
-=======
-            style="margin-bottom: 10px;"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             clearable
             @dblclick.native="param=0;openSupplier()"/>
         </el-col>
@@ -162,28 +108,19 @@
             style="margin-left: 10px"
             @click="pageCurrent=1;searchMaterial()">查询
           </el-button>
-<<<<<<< HEAD
           <el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
-=======
-          <el-button :disabled="token !== 11 && token !== 36" type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button
             :disabled="token !== 11 && token !== 36"
             type="warning"
             icon="el-icon-refresh"
             size="small"
-<<<<<<< HEAD
             style="margin:10px 10px 3px"
-=======
-            style="margin-left: 10px"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             @click="CategoryMaintenance">维护物料类别
           </el-button>
         </el-col>
       </el-row>
     </el-card>
 
-<<<<<<< HEAD
     <el-card>
       <el-table
         :data="tableData"
@@ -193,16 +130,6 @@
         highlight-current-row
         border
         stripe>
-=======
-    <el-card style="margin-top: 15px">
-      <el-table
-        :data="tableData"
-        style="width: 100%;min-height: 500px"
-        height="500"
-        size="mini"
-        highlight-current-row
-        border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column align="center" label="物料名称">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -228,7 +155,6 @@
             {{ scope.row.参考价格 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -252,24 +178,6 @@
                   @click="handleDelete(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              :disabled="token !== 11 && token !== 36"
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEdit(scope.row)">编辑
-            </el-button>
-            <el-button
-              :disabled="token !== 11 && token !== 36"
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)">删除
-            </el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
@@ -590,11 +498,7 @@ export default {
       param: 0,
       tableData: [],
       pageCurrent: 1,
-<<<<<<< HEAD
       pageSize: 30,
-=======
-      pageSize: 10,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: null,
       tableData1: [],
       pageCurrent1: 1,
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index 7fbfae68..09bbe182 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -157,8 +157,6 @@
             {{ scope.row.审批时间 ? scope.row.审核时间 : '—' }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
-=======
         <el-table-column label="处理" align="center" min-width="130">
           <template slot-scope="scope">
             <el-tag v-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===1" type="success" size="small">处理完成</el-tag>
@@ -166,7 +164,6 @@
             <span v-else>—</span>
           </template>
         </el-table-column>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="采购员" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -205,11 +202,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { initContract, initBuyer, searchTable1, searchTable2, deleteContract } from '@/api/PurchasingCenter/PurchaseContractSearch'
-=======
 import { initContract, initBuyer, searchTable1, searchTable2, deleteContract, handleDone } from '@/api/PurchasingCenter/PurchaseContractSearch'
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 import QRCode from 'qrcode'
 import $ from 'jquery'
 // import { exportExcelMethod } from './exportExcel'
@@ -284,8 +277,6 @@ export default {
     this.searchTable1()
   },
   methods: {
-<<<<<<< HEAD
-=======
     // 处理完成
     done(row) {
       this.$confirm('确定处理完成?', '提示', {
@@ -306,7 +297,6 @@ export default {
         })
       })
     },
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     deleteContract(row) { // 删除合同
       this.$confirm('此操作将永久删除合同所有内容，确定删除?', '提示', {
         confirmButtonText: '确定',
diff --git a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
index 39331b79..1013682b 100644
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -1,11 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-<<<<<<< HEAD
       <el-table :data="tableData1" highlight-current-row height="810" style="width: 100%;" size="mini" border stripe>
-=======
-      <el-table :data="tableData1" highlight-current-row height="550" style="width: 100%;" size="mini" border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="序号" type="index" align="center" width="50"/>
         <el-table-column label="项目名称" align="center" width="200px">
           <template slot-scope="scope">
@@ -93,11 +89,7 @@ export default {
       loading1: false,
       tableData1: [], // 表格数据
       total1: null, // 总条数
-<<<<<<< HEAD
       pageSize1: 30, // 每页显示条数
-=======
-      pageSize1: 10, // 每页显示条数
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       pageCurrent1: 1
     }
   },
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 38cddf6f..012170f7 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -1,41 +1,25 @@
 <template>
   <div class="app-container">
     <el-card>
-<<<<<<< HEAD
       <span style="margin-left: 0">项目名称:</span>
       <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small" style="margin-top: 3px">
-=======
-      <span>项目名称</span>
-      <el-select v-model="projectValue" placeholder="请选择项目名称" filterable size="small">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-option
           v-for="item in project"
           :key="item.value"
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
       <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
       <el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
-=======
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addReceipt">增加</el-button>
-      <el-button type="warning" size="small" icon="el-icon-download" @click="exportTable()">导出</el-button>
-      <div class="title">总装箱单</div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table
         v-loading="loading"
         :data="receiptData"
         border
-<<<<<<< HEAD
         stripe
         size="mini"
         highlight-current-row
         style="margin-top:3px;margin-bottom: 0"
         height="170px"
-=======
-        size="mini"
-        style="margin-top:20px"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         @row-click="searchTable">
         <el-table-column
           label="装箱单号"
@@ -70,7 +54,6 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.联系方式 }}</template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -92,56 +75,28 @@
                   @click="handleDeleteReceipt(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="handleEditReceipt(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="handleDeleteReceipt(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-<<<<<<< HEAD
     <el-card >
       <el-button :disabled="!disabled" plain type="primary" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
-=======
-    <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
-      <div class="title">主机</div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table
         v-loading="loading"
         :data="machineTableData"
         border
-<<<<<<< HEAD
         stripe
         highlight-current-row
         size="mini"
         height="170px"
         style="margin-top:3px;margin-bottom: 0">
-=======
-        size="mini"
-        style="margin-top:20px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-table
               :data="groupData"
               border
-<<<<<<< HEAD
               stripe
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini"
               style="width: 90%">
               <el-table-column
@@ -213,7 +168,6 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.备注 }}</template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="编辑" placement="top">
@@ -235,47 +189,22 @@
                   @click="deleteMachine(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="editMachine(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteMachine(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-<<<<<<< HEAD
     <el-card >
       <el-button :disabled="!disabled" type="primary" style="margin-top: 3px" plain size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
-=======
-    <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
-      <div class="title">随机供应的备件</div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table
         v-loading="loading"
         :data="spareData"
         border
-<<<<<<< HEAD
         stripe
         highlight-current-row
         height="170px"
         size="mini"
         style="margin-top:3px;margin-bottom: 0">
-=======
-        size="mini"
-        style="margin-top:20px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column
           label="序号"
           type="index"
@@ -308,7 +237,6 @@
           align="center">
           <template slot-scope="scope">{{ scope.row.备注 }}</template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column label="操作" fixed="right" align="center" width="150">
           <template slot-scope="scope">
             <el-tooltip class="item" effect="dark" content="编辑" placement="top">
@@ -330,38 +258,17 @@
                   @click="deleteSpare(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="editSpare(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteSpare(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
     </el-card>
 
-<<<<<<< HEAD
     <el-card >
       <el-button :disabled="!disabled" plain type="primary" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
-=======
-    <el-card style="margin-top: 10px">
-      <el-button :disabled="!disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
-      <div class="title">随机技术文件</div>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <el-table
         v-loading="fileLoading"
         :data="fileData"
         border
-<<<<<<< HEAD
         highlight-current-row
         stripe
         height="170px"
@@ -374,34 +281,15 @@
         <el-table-column
           label="名称"
           align="center">
-=======
-        size="mini"
-        style="margin-top:20px">
-        <el-table-column
-          label="序号"
-          align="center"
-          type="index"
-          min-width="150px"/>
-        <el-table-column
-          label="名称"
-          align="center"
-          min-width="200px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">{{ scope.row.名称 }}</template>
         </el-table-column>
         <el-table-column
           label="数量"
-<<<<<<< HEAD
           align="center">
-=======
-          align="center"
-          min-width="100px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">{{ scope.row.数量 }}</template>
         </el-table-column>
         <el-table-column
           label="备注"
-<<<<<<< HEAD
           align="center">
           <template slot-scope="scope">{{ scope.row.备注 }}</template>
         </el-table-column>
@@ -426,24 +314,6 @@
                   @click="deleteFile(scope.row)"/>
               </div>
             </el-tooltip>
-=======
-          align="center"
-          min-width="500px">
-          <template slot-scope="scope">{{ scope.row.备注 }}</template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              icon="el-icon-edit"
-              @click="editFile(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteFile(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/TechnologyCenter/ImportChangeParts/index.vue b/src/views/TechnologyCenter/ImportChangeParts/index.vue
index 27c2c03d..127e09ed 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/index.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/index.vue
@@ -5,11 +5,7 @@
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">
             <span>项目：</span>
-<<<<<<< HEAD
             <el-select v-model="projectValue" filterable size="small" style="margin-top: 3px" placeholder="项目名称">
-=======
-            <el-select v-model="projectValue" filterable size="small" placeholder="项目名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-option
                 v-for="item in project"
                 :key="item.value"
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 442f28cf..57b5378f 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -1,11 +1,7 @@
 <template>
   <div>
     <el-card>
-<<<<<<< HEAD
       <div style="width: 900px;margin: 3px auto">
-=======
-      <div style="width: 900px;margin: 0 auto">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <span>机床名称：</span>
         <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
           <el-option
@@ -14,11 +10,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
         <span style="margin-left: 10px">分组名称：</span>
-=======
-        <span>分组名称：</span>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-select v-model="groupValue" filterable clearable size="small" placeholder="分组名称">
           <el-option
             v-for="item in groupsNames"
@@ -26,15 +18,9 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
         <el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         <el-button type="danger" plain icon="el-icon-delete" size="small" style="margin-left: 10px" @click="allDelete">一键删除</el-button>
         <el-row style="margin-top: 10px">
-=======
-        <el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
-        <el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
-        <el-row style="margin-top: 20px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>机床名称：</span>
           <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
           <span>机床数量：</span>
@@ -48,53 +34,33 @@
         :data="tableData"
         :row-class-name="tableRowClassName"
         size="mini"
-<<<<<<< HEAD
         height="300"
         highlight-current-row
         border
         stripe
-=======
-        border
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         @row-click="searchMaterial1">
         <el-table-column
           label="序号"
           align="center"
           type="index"
           width="50"/>
-<<<<<<< HEAD
         <el-table-column align="center" label="物料状态" min-width="90">
-=======
-        <el-table-column align="center" label="物料状态" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             <el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
             <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="图号" min-width="120">
-=======
-        <el-table-column align="center" label="图号" min-width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.图号或者型号 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="名称" min-width="80">
-=======
-        <el-table-column align="center" label="名称" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="材料" width="100">
-=======
-        <el-table-column align="center" label="材料" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.材料或者规格 }}
           </template>
@@ -119,53 +85,31 @@
             {{ scope.row.部件数量 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="制造商" min-width="80">
-=======
-        <el-table-column align="center" label="制造商" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.制造商 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="备注" width="80">
-=======
-        <el-table-column align="center" label="备注" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="分类码" width="60">
-=======
-        <el-table-column align="center" label="分类码" width="80">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.分类码 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="整改类型" width="300">
           <template slot-scope="scope">
             <el-radio-group v-model="scope.row.整改类型" @change="submitChangeType(scope.row)" >
-=======
-        <el-table-column align="center" label="整改类型" width="250">
-          <template slot-scope="scope">
-            <el-radio-group v-model="scope.row.整改类型" @change="submitChangeType(scope.row)">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-radio :label="1" class="radio">新增</el-radio>
               <el-radio :label="2" class="radio">替换</el-radio>
               <el-radio :label="3" class="radio">补充加工</el-radio>
             </el-radio-group>
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="旧图号" >
-=======
-        <el-table-column align="center" label="旧图号" width="150">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.前图号或者型号 }}
           </template>
@@ -189,13 +133,9 @@
         style="width: 100%"
         size="mini"
         highlight-current-row
-<<<<<<< HEAD
         height="150"
         border
         stripe>
-=======
-        border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column
           label="序号"
           align="center"
@@ -822,16 +762,9 @@ export default {
 
 <style scoped>
   span{
-<<<<<<< HEAD
     margin: 3px;
   }
   radio {
     margin-left: 3px;
-=======
-    margin: 10px;
-  }
-  .radio {
-    margin-left: 10px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index ac0c7fc3..ea3790c1 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -1,19 +1,11 @@
 <template>
   <div class="app-container">
     <el-card v-loading="loading">
-<<<<<<< HEAD
       <div style="width: 650px;margin: 0 auto">
         <div style="overflow: hidden">
           <div style="margin-bottom: 10px;">
             <span>项目：</span>
             <el-select v-model="projectValue" filterable size="small" placeholder="项目名称" style="margin-top: 3px">
-=======
-      <div style="width: 620px;margin: 0 auto">
-        <div style="overflow: hidden">
-          <div style="margin-bottom: 10px;">
-            <span>项目：</span>
-            <el-select v-model="projectValue" filterable size="small" placeholder="项目名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               <el-option
                 v-for="item in project"
                 :key="item.value"
@@ -28,11 +20,7 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-<<<<<<< HEAD
             <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
-=======
-            <el-button type="primary" size="small" @click="opendialogVisibleMachine()">上传总图</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           </div>
           <upload-excel-component @on-selected-file="selected"/>
         </div>
@@ -42,11 +30,7 @@
           </el-tooltip>
           <el-upload :on-remove="handleRemove" :file-list="itemFile" action=""/>
         </div>
-<<<<<<< HEAD
         <div v-if="worksheet.length !== 0" style="float: right;margin: 3px 0">
-=======
-        <div v-if="worksheet.length !== 0" style="float: right;margin: 20px 0">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-button :disabled="disabled" icon="el-icon-upload2" type="primary" size="small" @click="basicPartsToSQL">导入到数据库</el-button>
         </div>
       </div>
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index d3fc49ca..9a382ccb 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -3,11 +3,7 @@
     <el-card>
       <div style="width: 900px;margin: 0 auto">
         <span>机床名称：</span>
-<<<<<<< HEAD
         <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" style="margin-top: 3px" @change="getGroups">
-=======
-        <el-select v-model="machineValue" filterable clearable size="small" placeholder="机床名称" @change="getGroups">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <el-option
             v-for="item in machineNames"
             :key="item.value"
@@ -22,15 +18,9 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
         <el-button :loading="listLoading" :disabled="disabled" type="primary" plain icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
         <el-button type="danger" icon="el-icon-delete" plain size="small" @click="allDelete">一键删除</el-button>
         <el-row style="margin-top: 5px;margin-bottom: 3px">
-=======
-        <el-button :loading="listLoading" :disabled="disabled" type="primary" icon="el-icon-d-caret" size="small" style="margin-left: 10px" @click="transferData">传递</el-button>
-        <el-button type="danger" icon="el-icon-delete" size="small" @click="allDelete">一键删除</el-button>
-        <el-row style="margin-top: 20px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <span>机床名称：</span>
           <el-input v-model="machineName" readonly size="small" placeholder="机床名称" style="width: 200px;"/>
           <span>机床数量：</span>
@@ -45,11 +35,8 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
-<<<<<<< HEAD
         stripe
         height="280px"
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         highlight-current-row
         @row-click="searchMaterial1">
         <el-table-column
@@ -57,7 +44,6 @@
           align="center"
           type="index"
           width="50"/>
-<<<<<<< HEAD
         <el-table-column align="center" label="物料状态" min-width="50">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.物料流水号===null" type="warning" size="small" style="margin: 0px">不存在</el-tag>
@@ -65,24 +51,11 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="图号" min-width="150">
-=======
-        <el-table-column align="center" label="物料状态" min-width="100">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="small">不存在</el-tag>
-            <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="small">存在</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="图号" min-width="200">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.图号或者型号 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="名称" min-width="200" show-overflow-tooltip>
-=======
-        <el-table-column align="center" label="名称" min-width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
@@ -92,11 +65,7 @@
             {{ scope.row.材料或者规格 }}
           </template>
         </el-table-column>
-<<<<<<< HEAD
         <el-table-column align="center" label="规格" width="150">
-=======
-        <el-table-column align="center" label="规格" width="100">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -146,11 +115,7 @@
         <!--</template>-->
         <!--</el-table-column>-->
       </el-table>
-<<<<<<< HEAD
       <div class="block">
-=======
-      <div class="block" style="margin-top: 10px;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-pagination
           :current-page="pageCurrent"
           :page-sizes="[10, 20, 40, 100]"
@@ -167,15 +132,10 @@
         :cell-class-name="cell"
         style="width: 100%"
         size="mini"
-<<<<<<< HEAD
         height="200px"
         highlight-current-row
         border
         stripe>
-=======
-        highlight-current-row
-        border>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column
           label="序号"
           align="center"
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 06c05d95..76ff585c 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -29,10 +29,6 @@
       </el-select>
 
       <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
-<<<<<<< HEAD
-=======
-      <el-button :loading="downloadLoading" type="success" icon="el-icon-download" size="small" style="margin-left: 15px" @click="handleDownload()">导出EXCEL</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     </el-card>
     <el-card>
       <div v-for="(file, key) in hadFile" :key="key">
@@ -263,19 +259,10 @@
 import { projectSelect, machineSelect, groupSelect, basicPartsData, deleteBasicParts, purchasePartsData, deletePurchaseData, getFileData } from '@/api/TechnologyCenter/QueryParts'
 import { mapGetters } from 'vuex'
 import { ServerIP } from '@/utils/request'
-<<<<<<< HEAD
-=======
-import request from '@/utils/request'
-
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   name: 'Index',
   data() {
     return {
-<<<<<<< HEAD
-=======
-      downloadLoading: false,
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       projectValue: '',
       project: [],
       machineValue: '',
@@ -355,86 +342,6 @@ export default {
     this.fetchData()
   },
   methods: {
-<<<<<<< HEAD
-=======
-    async handleDownload() {
-      this.downloadLoading = true
-      await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `declare @项目流水号 int =${this.projectValue}
-                create table #临时表1
-                (
-                    id   int IDENTITY (1,1)     not null,
-                    物料名称 nvarchar(50),
-                    物料规格 nvarchar(50),
-                    物料型号 nvarchar(50),
-                    primary key (id)
-                );
-                create table #临时表2
-                (
-                    id   int IDENTITY (1,1)     not null,
-                    物料名称 nvarchar(50),
-                    物料规格 nvarchar(50),
-                    物料型号 nvarchar(50),
-                    总数量 int,
-                    primary key (id)
-                );
-                insert into #临时表1 select distinct 物料名称,物料规格,物料型号 from dbo.零件查询_物料规格型号_统计查询_视图
-                where 项目流水号=@项目流水号
-                declare @id int =1
-                declare @id2 int
-                declare @物料名称 nvarchar(50)
-                declare @物料规格 nvarchar(50)
-                declare @物料型号 nvarchar(50)
-                declare @总数量 int
-                while (@id<=(select COUNT (id) from #临时表1 ))
-                begin
-                 select @物料名称=物料名称,@物料规格=物料规格,@物料型号=物料型号 from #临时表1
-                 where id=@id
-                 insert into #临时表2 (物料名称,物料规格,物料型号) values (@物料名称,@物料规格,@物料型号)
-                 set @id2 = @@IDENTITY
-                 select @总数量 = COUNT(物料流水号) from 零件查询_物料规格型号_统计查询_视图
-                 where 物料名称=@物料名称 and 物料规格=@物料规格 and 物料型号=@物料型号 and 项目流水号=@项目流水号
-                 update #临时表2 set 总数量 = @总数量
-                 where id=@id2
-                 set @id = @id + 1
-                end
-                select * from #临时表2
-                drop table #临时表1
-                drop table #临时表2`
-        }
-      }).then(res => {
-        if (res.data.length === 0) {
-          this.$message.error('暂无数据')
-          this.downloadLoading = false
-        } else {
-          import('./Export2Excel').then(excel => {
-            const tHeader = ['物料名称', '物料型号', '物料规格', '总数量']
-            const filterVal = ['物料名称', '物料型号', '物料规格', '总数量']
-            const list = res.data
-            const data = this.formatJson(filterVal, list)
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: 'EXCEL',
-              autoWidth: true,
-              bookType: 'xlsx'
-            })
-            this.downloadLoading = false
-          })
-        }
-      })
-    },
-    formatJson(filterVal, jsonData) {
-      return jsonData.map(v => filterVal.map(j => {
-        return v[j]
-      }))
-    },
-    // ///////////////////////////////////////////////////↑0910zdy
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     // 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据
     getFileData(machineValue) {
       this.hadFile = []
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index edf857c2..448e5fd0 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -222,23 +222,6 @@
               <el-input v-model="form1.remark" size="small" placeholder="备注"/>
             </el-form-item>
           </el-col>
-<<<<<<< HEAD
-          <b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>
-          <el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">
-            <el-upload
-              id="invoiceScan"
-              ref="upload"
-              :auto-upload="false"
-              :on-success="uploadSuccess"
-              :before-upload="beforeUpload"
-              :on-exceed="warningExceed"
-              :limit="limit"
-              :action="upload+'?invoiceNum='+form1.invoiceNum+'&money='+form1.money+'&supplierValue='+form1.supplierValue+'&paid='+form1.paid+'&unpaid='+form1.unpaid+'&tax='+form1.tax+'&isCost='+form1.isCost+'&remark='+form1.remark+'&personId='+id"
-              list-type="picture-card">
-              <i class="el-icon-plus"/>
-            </el-upload>
-          </el-form-item>
-=======
           <!--<b v-show="title1 === '创建发票结算申请单'" style="float:left;color: #f56c6c;margin-top: 13px">* </b>-->
           <!--<el-form-item v-show="title1 === '创建发票结算申请单'" label="发票扫描件" style="display: inline-block">-->
           <!--<el-upload-->
@@ -254,7 +237,6 @@
           <!--<i class="el-icon-plus"/>-->
           <!--</el-upload>-->
           <!--</el-form-item>-->
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -335,19 +317,11 @@
 </template>
 
 <script>
-<<<<<<< HEAD
-import { searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
-  addTable2, deleteTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApplication1'
-import { mapGetters } from 'vuex'
-import { uploadInvoiceScan1, readFile } from '@/utils/request'
-import request from '@/utils/request'
-=======
 import { insertInto, searchSupplier, searchTable1, submitEdit, submitDelete, submitApply, searchTable2, searchPurchase, searchOffline, searchPurchaseDetail, searchOfflineDetail,
   addTable2, deleteTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApplication1'
 import { mapGetters } from 'vuex'
 import { uploadInvoiceScan1 } from '@/utils/request'
 
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 export default {
   name: '', // 发票结算申请
   data() {
@@ -455,11 +429,6 @@ export default {
     submitAdd1() { // 提交新增
       this.$refs['form1'].validate((valid) => {
         if (valid) {
-<<<<<<< HEAD
-          this.$refs.upload.submit() // 上传图片
-        } else {
-          console.log('error submit!!')
-=======
           insertInto(this.form1.invoiceNum, this.form1.money, this.form1.supplierValue, this.form1.paid, this.form1.unpaid, this.form1.tax, this.form1.isCost, this.form1.remark).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('增加成功')
@@ -470,7 +439,6 @@ export default {
             }
           })
         } else {
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -488,10 +456,6 @@ export default {
             } else { this.$message.error('编辑失败') }
           })
         } else {
-<<<<<<< HEAD
-          console.log('error submit!!')
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -534,19 +498,6 @@ export default {
       })
     },
     async searchPic(row, i) {
-<<<<<<< HEAD
-      const { data } = await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select * from 车间采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
-        }
-      })
-      this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
-      console.log(this.tableData1[i].scanSrc)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     warningExceed() {
       this.$message.error('仅可上传一张发票')
@@ -612,10 +563,6 @@ export default {
       this.supplierValue = row.供应商流水号
       Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
       searchTable2(row.发票结算申请单流水号).then(response => {
-<<<<<<< HEAD
-        console.log(response.data)
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         this.tableData2 = response.data
       })
     },
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 5398baf7..95619adf 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -3,11 +3,7 @@
     <div class="dashboard-container">
       <div class="sudoku_row" >
         <div class="dashboard-text" style="color:white">用户名：{{ name }}</div>
-<<<<<<< HEAD
         <el-divider content-position="right" style="margin:24px">消息通知</el-divider>
-=======
-        <el-divider content-position="right">消息通知</el-divider>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-card v-for="(sudoku,index) in sudokus" :class="curSelect === sudoku.id?'opacity':''" :key="index+9999" shadow="hover" class="sudoku_item ">
           <div>
             <el-badge :value="sudoku.value">
@@ -16,17 +12,10 @@
             </el-badge>
           </div>
         </el-card>
-<<<<<<< HEAD
         <el-divider content-position="right" style="margin:24px"/>
 
         <div v-for="(value1,index1) in fathers" :key="index1" style="width:100%">
           <el-divider content-position="left" style="margin:24px">{{ value1.title }}</el-divider>
-=======
-        <el-divider content-position="right"/>
-
-        <div v-for="(value1,index1) in fathers" :key="index1" style="width:100%">
-          <el-divider content-position="left">{{ value1.title }}</el-divider>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           <router-link v-for="(value2,index2) in sons" v-if="value2.pid === value1.id" :key="index2" :to="value2.path">
             <el-card shadow="hover" class="sudoku_item" style="height:150px;width:170px;margin: 5px;display: inline-block;background: rgba(255,255,255,0.4)">
               <svg-icon :icon-class="value2.icon" :style="{color:Color(index2)}" class="bgc" style="display:block;margin: auto;border: 0 solid black;width:70px;height:70px"/><br>
@@ -160,10 +149,7 @@ export default {
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
-<<<<<<< HEAD
 
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   /*.text {*/
     /*font-size: 14px;*/
   /*}*/
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index e4e8deb2..ed3e7e7d 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -26,10 +26,6 @@ export default {
   /*50 = navbar  */
   position: relative;
   overflow: hidden;
-<<<<<<< HEAD
   /*min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;*/
-=======
-  min-height:calc(100vh - 50px);background: url('../../../../static/bg.jpg') repeat;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 </style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index b12b49af..4e912bf0 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -1,9 +1,5 @@
 <template>
-<<<<<<< HEAD
   <el-menu class="navbar" mode="horizontal" style="background: rgb(87,177,253)!important;">
-=======
-  <el-menu class="navbar" mode="horizontal" style="background: rgb(163,173,182)!important;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     <hamburger :toggle-click="toggleSideBar" :is-active="sidebar.opened" class="hamburger-container"/>
     <breadcrumb />
     <el-dropdown class="avatar-container" trigger="click">
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index 357a0edf..ceef988a 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -7,11 +7,7 @@
         :default-active="$route.path"
         :collapse="isCollapse"
         mode="vertical"
-<<<<<<< HEAD
         background-color="#152c7c"
-=======
-        background-color="#304156"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         text-color="#cccccc"
         active-text-color="#409EFF"
         style="height:calc(100% - 124px)"
@@ -61,13 +57,8 @@ export default {
 <style lang="scss" scoped>
   .img-wrapper{
     img{
-<<<<<<< HEAD
       width: 180px;
       margin: 20px 10px 20px 10px;
-=======
-      width: 84px;
-      margin: 20px 60px 20px 60px;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     }
   }
 </style>
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 19d20824..60759c22 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="tags-view-container">
-<<<<<<< HEAD
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" style="background: rgb(255,255,255)!important;">
-=======
-    <scroll-pane ref="scrollPane" class="tags-view-wrapper" style="background: rgb(163,173,182)!important;">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       <router-link v-for="tag in Array.from(visitedViews)" ref="tag" :class="isActive(tag)?'active':''" :to="tag.path" :key="tag.path" class="tags-view-item" @contextmenu.prevent.native="openMenu(tag,$event)" >
         {{ tag.title }}
         <span class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"/>
@@ -138,15 +134,9 @@ export default {
         position: relative;
         height: 26px;
         line-height: 26px;
-<<<<<<< HEAD
         border: 1px solid rgb(52,119,190);
         color:  rgb(52,119,190);
         background: white;
-=======
-        border: 1px solid #3d3780;
-        color: #3d3780;
-        background: inherit;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         padding: 0 8px;
         font-size: 12px;
         margin-left: 5px;
@@ -155,11 +145,7 @@ export default {
           margin-left: 15px;
         }
         &.active {
-<<<<<<< HEAD
           background-color: rgb(52,119,190);
-=======
-          background-color: #3d3780;
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           color: #ffffff;
           border-color: #ffffff;
           &::before {