new

src/api/ManufacturingCenter/MaterialArrivalManagement.js

@@ -1,5 +1,64 @@
 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: '机床名称流水号_查询数据'
+    }
+  })
+}
+
+export function getGroups(stepNumber) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组',
+      param: '机床流水号=' + stepNumber + '=int'
+    }
+  })
+}
+
+// 查询零件
+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({
@@ -12,19 +71,7 @@ export function change3(Number, code, num) {
     }
   })
 }
-// 查询零件
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
-export function searchtable(num1, num2, num3, pageCurrent, pageSize) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_零件工艺计划_编制工艺_备料到货查询',
-      param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料到货_check=' + num3,
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
 // 查询零件工艺
 export function searchtable2(num1) {
   return request({

src/api/ManufacturingCenter/ParseQuery.js

@@ -10,3 +10,28 @@ export function SelectMachine() {
     }
   })
 }
+<<<<<<< HEAD
+=======
+export function ProcessOutsourcing() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '工序外协_综合查询',
+      param: '机床流水号=' + arguments[0]
+    }
+  })
+}
+export function ProcessProportion() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '工序外协_工序占比_综合查询',
+      param: '机床流水号=' + arguments[0]
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/ManufacturingCenter/ProjectPlanningQuery.js

@@ -59,3 +59,18 @@ export function searchtable5(num1, num2, num3, num4, num5, num6, num7, num8, num
     }
   })
 }
+<<<<<<< HEAD
+=======
+// 查询项目总信息
+export function searchAll(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '16_项目总查询',
+      param: '项目流水号_check=' + num1 + '&项目流水号=' + num2
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/PurchasingCenter/CreateInquirySheet.js

@@ -1,5 +1,29 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+// 查询询价单号
+export function getBillNum(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_创建询价单单号_查询数据'
+    }
+  })
+}
+export function getGongyings(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_创建询价单单号_查询数据'
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询全部未询价的标准件和外购件
 export function getExport1(num) {
   return request({
@@ -130,7 +154,11 @@ 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',

src/api/PurchasingCenter/InvoiceSettlementApplication.js

@@ -1,5 +1,19 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '采购管理_发票结算申请单_增加数据',
+      param: `发票号=${num2}&发票金额=${num3}&供应商流水号=${num4}&已付款项=${num5}&尚欠金额=${num6}&税额=${num7}&是否费用类=${num8}&备注=${num9}`
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({

src/api/PurchasingCenter/PurchaseContractSearch.js

@@ -59,3 +59,17 @@ export function deleteContract(num) {
     }
   })
 }
+<<<<<<< HEAD
+=======
+// 删除采购合同
+export function handleDone(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '4',
+      name: `update 采购管理_采购合同_采购部 set 不通过处理 = 1 where 采购合同流水号 = '${num}'`
+    }
+  })
+}
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/api/WorkshopProcurement/InvoiceSettlementApplication1.js

@@ -1,5 +1,20 @@
 import request from '@/utils/request'
 
+<<<<<<< HEAD
+=======
+export function insertInto(num2, num3, num4, num5, num6, num7, num8, num9) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间采购管理_发票结算申请单_增加数据',
+      param: `发票号=${num2}&发票金额=${num3}&供应商流水号=${num4}&已付款项=${num5}&尚欠金额=${num6}&税额=${num7}&是否费用类=${num8}&备注=${num9}`
+    }
+  })
+}
+
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 // 查询供应商
 export function searchSupplier() {
   return request({

src/components/Breadcrumb/index.vue

@@ -37,15 +37,24 @@ 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;
     }
   }

src/main.js

@@ -21,8 +21,10 @@ 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)

src/styles/element-ui.scss

@@ -28,6 +28,7 @@
   }
 }
  .el-table th{
+<<<<<<< HEAD
    background-color: #7eaced;
    color: white;/*修改表格头部背景*/
    line-height: 3em!important;
@@ -50,20 +51,40 @@
  }
  .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

src/styles/index.scss

@@ -24,7 +24,11 @@ html {
 #app{
   height: 100%;
   .sidebar-container{
+<<<<<<< HEAD
     background-color: #152c7c;
+=======
+    background-color: #2e296a;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 }
 
@@ -99,13 +103,18 @@ 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{
@@ -166,4 +175,7 @@ el-card{
     background: #ff9759;
     border-color: #ff9759;
   }
+=======
+  background-color: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }

src/styles/sidebar.scss

@@ -45,7 +45,11 @@
     .el-menu {
       border: none;
       height: 100%;
+<<<<<<< HEAD
       background: #152c7c!important;
+=======
+      background: #2e296a!important;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       width: 100% !important;
     }
   }

src/styles/variables.scss

@@ -1,4 +1,10 @@
 //sidebar
+<<<<<<< HEAD
 $menuBg:#152c7c;
 $subMenuBg:rgb(29,53,149);
 $menuHover:rgb(40,114,199);
+=======
+$menuBg:#304156;
+$subMenuBg:#3d3780;
+$menuHover:#9892E4;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/utils/request.js

@@ -23,7 +23,11 @@ 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 // 请求超时时间
 })
 

src/views/BasicData/WorkshopProcessMaintenance/index.vue

@@ -4,14 +4,24 @@
       <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>
@@ -22,6 +32,7 @@
             v-loading="loading1"
             ref="multipleTable"
             :data="tableData1"
+<<<<<<< HEAD
             size="mini"
             highlight-current-row
             stripe
@@ -29,6 +40,12 @@
             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.工艺分类名称)">
@@ -50,6 +67,7 @@
           <el-table
             :data="tableData2"
             :row-key="getRowKeys"
+<<<<<<< HEAD
             :row-style="abc"
             :expand-row-keys="expands"
             size="mini"
@@ -63,10 +81,21 @@
               <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">
@@ -88,34 +117,66 @@
                             @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>
@@ -124,7 +185,11 @@
         </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"/>
@@ -148,7 +213,11 @@
       </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"/>
@@ -259,11 +328,14 @@ export default {
     this.searchProcessClassification()
   },
   methods: {
+<<<<<<< HEAD
     abc() {
       return {
         height: '35px'
       }
     },
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     searchProcessClassification() {
       this.loading1 = true
       searchProcessClassification().then(response => {
@@ -584,9 +656,16 @@ export default {
 </script>
 
 <style scoped>
+<<<<<<< HEAD
   /*.el-card {*/
   /*  margin-top: 15px;*/
   /*  margin-left: 15px;*/
  /* }!**!*/
+=======
+  .el-card {
+    margin-top: 15px;
+    margin-left: 15px;
+  }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 </style>

src/views/Inventory/GenneralPart/index.vue

@@ -0,0 +1,270 @@
+<template>
+
+  <div class="app-container">
+
+    <el-card>
+      <span style="margin: 5px">零件图号</span>
+      <el-input v-model="partNumber" clearable size="small" style="width:200px" />
+      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getscantable()">查询</el-button>
+      <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" @click="Empty()">清空</el-button>
+    </el-card>
+    <el-card>
+      <el-table
+        v-loading="listLoading"
+        :data="tableData"
+        border
+        style="width: 100%;height: 650px" >
+        <el-table-column
+          label="序号"
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="项目名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.项目名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="机床图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="计划数量" align="center" min-width="100">
+          <template slot-scope="scope" align="center">
+            <el-input v-model="tableData[scope.$index].plannumber" readonly size="small"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="入库数量" align="center" min-width="100">
+          <template slot-scope="scope">
+            <el-input v-model="tableData[scope.$index].innumber" clearable size="small"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="仓库" align="center" min-width="100">
+          <template slot-scope="scope">
+            <el-select v-model="inventoryNumber" filterable clearable size="small" placeholder="仓库名称" @change="Getlocate">
+              <el-option
+                v-for="item in inventoryName"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="货位" align="center" min-width="120">
+          <template slot-scope="scope">
+            <el-select v-model="locateNumber" filterable clearable size="small" placeholder="货位名称">
+              <el-option
+                v-for="item in locateName"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"/>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope" align="center">
+            <el-input v-model="tableData[scope.$index].note" clearable size="small"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" min-width="150">
+          <template slot-scope="scope">
+            <el-button type="primary" size="mini" class="el-icon-success" @click="Innumber">入库</el-button>
+            <el-button
+              :disabled="scope.row.是否禁用"
+              size="mini"
+              type="danger"
+              class="el-icon-delete"
+              @click="handleDelete(scope.$index, scope.row)">移除</el-button>
+          </template>
+        </el-table-column>
+
+      </el-table>
+
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchTable, insertOne, getinventory, getlocate } from '@/api/Inventory/Inboundscanning'
+import { mapGetters } from 'vuex'
+import { wsuri, name } from '@/utils/request'
+import print from '@/vendor/print'
+export default {
+  data() {
+    return {
+      ace: 0,
+      a: '',
+      tableData: [],
+      partNumber: '',
+      listLoading: false,
+      craftplannumber: '',
+      radio2: 3,
+      PeopleNumber: '',
+      inventoryName: [], // 仓库名称下拉框
+      inventoryNumber: '',
+      locateName: [], // 货位名称下拉框
+      locateNumber: ''
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ])
+  },
+  created() {
+    this.initWebpack()
+    this.getpeopleid()
+    this.Getinvent()
+  },
+  methods: {
+    handleDelete(index, row) {
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.tableData.splice(index, 1)
+        this.$message({
+          message: '已被成功移除',
+          type: 'success'
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 获取人员编号
+    getpeopleid() {
+      this.PeopleNumber = this.id
+    },
+    aaa() {
+      print('#print')
+    },
+    initWebpack() { // 初始化websocket
+      this.websock = new WebSocket(wsuri)// 这里面的this都指向vue
+      this.websock.onopen = this.websocketopen
+      this.websock.onmessage = this.websocketonmessage
+      this.websock.onclose = this.websocketclose
+      this.websock.onerror = this.websocketerror
+    },
+    websocketopen() { // 打开
+      console.log('WebSocket连接成功')
+      this.websock.send('{<' + name + '>}')
+    },
+    websocketonmessage(msg) { // 数据接收
+      this.partNumber = msg.data.split('|')[3]
+      this.getscantable()
+    },
+    websocketclose() { // 关闭
+      console.log('WebSocket关闭')
+    },
+    websocketerror() { // 失败
+      console.log('WebSocket连接失败')
+    },
+    // 扫描查询
+    getscantable() {
+      if (this.partNumber === '') {
+        this.$message.error('请输入零件号')
+      } else {
+        this.listLoading = true
+        searchTable(this.partNumber).then(response => {
+          if (response.data.length === 0) {
+            this.listLoading = false
+            this.$message.warning('无此零件')
+          } else if (response.data[0].剩余数量 === 0) {
+            this.$message.warning('该零件已入库完毕')
+          } else {
+            for (let i = 0; i < this.tableData.length; i++) {
+              if (response.data[0].工艺计划流水号 === this.tableData[i].工艺计划流水号) {
+                this.ace = this.ace + 1
+              }
+            }
+            if (this.ace === 0) {
+              this.tableData.push({
+                plannumber: response.data[0].剩余数量,
+                innumber: response.data[0].入库数量,
+                capture: '',
+                note: '',
+                工艺计划流水号: response.data[0].工艺计划流水号,
+                项目名称: response.data[0].项目名称,
+                机床图号: response.data[0].机床图号,
+                零件图号: response.data[0].零件图号
+              })
+            } else {
+              this.$message.error('此件已在列表中')
+            }
+          }
+        }).then(() => {
+          this.listLoading = false
+          this.ace = 0
+        })
+      }
+    },
+    // 修改入库
+    Innumber() {
+      this.$confirm('此操作将不可逆转,且如果入库数量大于计划数量，则全部入库,是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        if (this.locateNumber === '') {
+          this.$message.error('请选择货位')
+        } else {
+          for (let i = 0; i < this.tableData.length; i++) {
+            if (this.tableData[i].innumber === '0') {
+              this.$message.error('请输入正确数量')
+            } else {
+              if (this.tableData[i].innumber > this.tableData[i].plannumber) {
+                this.tableData[i].innumber = this.tableData[i].plannumber
+              }
+              insertOne(this.tableData[i].工艺计划流水号, this.tableData[i].innumber, this.PeopleNumber, this.tableData[i].capture, this.inventoryNumber, this.locateNumber, this.tableData[i].note).then(response => {
+                this.$message({
+                  type: 'success',
+                  message: '零件入库成功!'
+                })
+              }).then(() => {
+                this.Empty()
+              })
+            }
+          }
+        }
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消入库'
+        })
+      })
+    },
+    // 清空
+    Empty() {
+      this.tableData = []
+    },
+    // 仓库查询
+    Getinvent() {
+      this.getSelect(getinventory, ['仓库名称', '仓库流水号'], 'inventoryName')
+    },
+    // 根据项目获取机床
+    Getlocate() {
+      this.locateName = []
+      this.locateNumber = ''
+      if (this.inventoryNumber) {
+        this.getSelect(getlocate, ['货位名称', '货位流水号'], 'locateName', this.inventoryNumber)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card {
+    margin-bottom: 15px;
+  }
+</style>

src/views/ManufacturingCenter/InitialProduction/index.vue

@@ -340,6 +340,10 @@
 <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() {
@@ -436,8 +440,24 @@ export default {
       'id'
     ])
   },
+<<<<<<< HEAD
   created() {
     this.typeChange()
+=======
+  watch: {
+    // 如果路由有变化，会再次执行该方法
+    '$route': {
+      handler(route) {
+        const _this = this
+        if (route.name === 'InitialProduction') {
+          _this.typeChange()
+        }
+      }
+    }
+  },
+  created() {
+    // this.typeChange()
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     this.getCurrentTime()
     this.getNowTime()
   },
@@ -508,6 +528,7 @@ export default {
       })
     },
     typeChange() {
+<<<<<<< HEAD
       this.NumValue = ''
       this.Num = []
       getToolNum().then(response => {
@@ -519,6 +540,42 @@ export default {
           })
         }
       })
+=======
+      if (Cookie.get('machineValue') !== undefined) {
+        this.toolNumValue = ''
+        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].项目名称
+            })
+          }
+        }).then(() => {
+          this.toolNumValue = parseInt(Cookie.get('machineValue'))
+          this.typeChange1()
+          this.NumValue = parseInt(Cookie.get('group'))
+          this.getTable()
+          Cookie.remove('machineValue')
+          Cookie.remove('group')
+        })
+      } else {
+        this.toolNumValue = ''
+        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].项目名称
+            })
+          }
+        })
+      }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     typeChange1() {
       this.NumValue = ''

src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue

@@ -1,6 +1,28 @@
 <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
+          v-for="item in Machines"
+          :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.value2 }}</div>
+        </el-option>
+      </el-select>
+      <span>组号:</span>
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="margin-top:10px;width: 180px;">
+        <el-option
+          v-for="item in Groups"
+          :key="item.value"
+          :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>
@@ -91,11 +113,25 @@
 </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'
+
+export default {
+  data() {
+    return {
+      Machine: '',
+      Machines: [],
+      Group: '',
+      Groups: [],
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       arrest2: [],
       editTime: '',
       bianliang1: [],
@@ -127,10 +163,28 @@ export default {
       'userId'
     ])
   },
+<<<<<<< HEAD
   created() {
     this.searchTable()
     this.searchTable2()
   },
+=======
+  watch: {
+    // 如果路由有变化，会再次执行该方法
+    '$route': {
+      handler(route) {
+        const _this = this
+        if (route.name === 'MaterialArrivalManagement') {
+          _this.getMachine()
+        }
+      }
+    }
+  },
+  // created() {
+  //   this.searchTable()
+  //   this.searchTable2()
+  // },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     handleSelectionChange2(val) {
       this.arrest2 = val
@@ -150,17 +204,79 @@ export default {
         })
       }
     },
+<<<<<<< HEAD
+=======
+    getMachine() {
+      if (Cookie.get('machineValue') !== undefined) {
+        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].项目名称
+            })
+          }
+        }).then(() => {
+          this.Machine = parseInt(Cookie.get('machineValue'))
+          this.getGroup()
+          this.Group = parseInt(Cookie.get('group'))
+          this.searchTable()
+          Cookie.remove('machineValue')
+          Cookie.remove('group')
+          this.searchTable2()
+        })
+      } else {
+        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].项目名称
+            })
+          }
+        })
+        this.searchTable()
+      }
+    },
+    getGroup() {
+      this.Group = ''
+      this.Groups = []
+      getGroups(this.Machine).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Groups.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     // 查询表格数据
     searchTable() {
       this.loading = true
       this.tableData = []
       this.Data = []
+<<<<<<< HEAD
       if (this.partName !== '' && this.partName !== null) {
         this.partNamecheck = true
       } else {
         this.partNamecheck = false
       }
       searchtable(this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
+=======
+      if (this.Machine) { this.Machinecheck = true } else { this.Machinecheck = false }
+      if (this.Group) { this.Groupcheck = true } else { this.Groupcheck = false }
+      if (this.partName) { this.partNamecheck = true } else { this.partNamecheck = false }
+      searchtable(this.Machinecheck, this.Machine, this.Groupcheck, this.Group, this.partNamecheck, this.partName, 0, this.pageCurrent, this.pageSize).then(response => {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         if (response.data.total === 0) {
           this.loading = false
         } else {

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -557,6 +557,10 @@
 <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() {
@@ -646,11 +650,26 @@ export default {
       'id'
     ])
   },
+<<<<<<< HEAD
+=======
+  watch: {
+    // 如果路由有变化，会再次执行该方法
+    '$route': {
+      handler(route) {
+        const _this = this
+        if (route.name === 'PartAssignment') {
+          _this.fetchData()
+        }
+      }
+    }
+  },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   created() {
     this.fetchData()
   },
   methods: {
     fetchData() {
+<<<<<<< HEAD
       initProject().then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.machineNumber.push({
@@ -682,6 +701,63 @@ export default {
         }
         this.tableData10 = response.data
       })
+=======
+      if (Cookie.get('machineValue') !== undefined) {
+        this.machineNumber = []
+        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].机床流水号
+            })
+          }
+        }).then(() => {
+          this.machineNumberValue = parseInt(Cookie.get('machineValue'))
+          this.machineChange()
+          this.groupNumberValue = parseInt(Cookie.get('group'))
+          this.searchTable()
+          Cookie.remove('machineValue')
+          Cookie.remove('group')
+        })
+      } else {
+        this.machineNumberValue = ''
+        this.groupNumberValue = ''
+        this.tableData = []
+        this.machineNumber = []
+        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
+        })
+      }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     PartCallbackInformation() {
       this.dialogFormVisible1 = true

src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue

@@ -1,6 +1,7 @@
 <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">
@@ -32,14 +33,63 @@
             :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">
@@ -90,6 +140,7 @@
       </div>
     </el-card>
     <el-card>
+<<<<<<< HEAD
       <div>
         <el-tooltip effect="dark" content="将在制零件打回，重新编制工艺定额" placement="top">
           <div style="display: inline-block">
@@ -99,6 +150,11 @@
       </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>
@@ -166,7 +222,11 @@
           </tr>
         </table>
       </div>
+<<<<<<< HEAD
     </el-dialog>
+=======
+    </el-card>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   </div>
 </template>
 
@@ -185,14 +245,21 @@ export default {
       personValue: '',
       person: [],
       pageCurrent: 1,
+<<<<<<< HEAD
       pageSize: 20,
+=======
+      pageSize: 10,
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0,
       tableData: [],
       loading: false,
       PrNum: '',
       tableData2: [],
       tableData3: [],
+<<<<<<< HEAD
       dialogFormVisiblePeople: false,
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       机床号: '',
       组号: '',
       零件图号: '',
@@ -285,7 +352,10 @@ export default {
       this.零件图号 = row.零件图号
       searchtable1(row.工艺计划流水号).then(response => {
         this.tableData2 = response.data
+<<<<<<< HEAD
         this.dialogFormVisiblePeople = true
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       })
     },
     handleSelectionChange(val) {
@@ -319,4 +389,16 @@ export default {
   .tg .tg-x61c{font-weight:bold;font-size:28px;border-color:inherit;text-align:center;vertical-align:top}
 </style>
 <style scoped>
+<<<<<<< HEAD
+=======
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-card{
+    margin-bottom: 15px;
+  }
+    .el-col{
+        margin-bottom: 10px;
+    }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>

src/views/ManufacturingCenter/ProcessAdjustQuery/index.vue

@@ -2,30 +2,49 @@
   <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.工序顺序 }}
@@ -50,9 +69,15 @@
         </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.工序顺序 }}
@@ -251,7 +276,11 @@ export default {
 
 <style scoped>
   .el-card{
+<<<<<<< HEAD
     /*margin-bottom: 15px;*/
+=======
+    margin-bottom: 15px;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .el-date-editor{
     width:200px
@@ -263,7 +292,11 @@ export default {
     width:200px
   }
   span{
+<<<<<<< HEAD
     /*margin: 10px 0 10px 10px;*/
+=======
+    margin: 10px 0 10px 10px;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
   .searchForm .el-form-item{
     margin-bottom: 5px;

src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue

@@ -1,11 +1,19 @@
 <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"
@@ -17,7 +25,11 @@
       <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>
@@ -32,6 +44,7 @@
           <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>-->
@@ -44,6 +57,20 @@
         <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"/>
@@ -54,9 +81,15 @@
       </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"
@@ -65,12 +98,21 @@
             </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"/>
@@ -142,9 +184,15 @@
 
     <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"
@@ -153,9 +201,15 @@
             :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">原有
@@ -256,22 +310,34 @@
               <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>
@@ -1673,13 +1739,21 @@ 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;
@@ -1689,6 +1763,7 @@ export default {
   .processTable{
     .el-input__inner{
       font-weight: bold;
+<<<<<<< HEAD
       font-size: 18px;
       height: 35px;
     }
@@ -1699,6 +1774,17 @@ export default {
     .el-cascader__label{
       font-weight: bold;
       font-size: 18px;
+=======
+      font-size: 20px;
+    }
+    .el-textarea__inner{
+      font-weight: bold;
+      font-size: 20px;
+    }
+    .el-cascader__label{
+      font-weight: bold;
+      font-size: 20px;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     }
   }
 </style>

src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue

@@ -6,7 +6,11 @@
         <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"
@@ -16,16 +20,26 @@
           <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>
@@ -33,11 +47,17 @@
         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="零件号">
@@ -89,6 +109,7 @@
       </div>
     </el-card>
 
+<<<<<<< HEAD
     <el-dialog :visible.sync="dialogFormVisible" title="选择工艺定额人员" center>
       <el-table
         :data="tableData2"
@@ -96,6 +117,13 @@
         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">
@@ -153,7 +181,11 @@ export default {
       multipleSelection: [],
       result: 0,
       PageCurrent: 1,
+<<<<<<< HEAD
       PageSize: 20,
+=======
+      PageSize: 10,
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: 0
     }
   },
@@ -366,7 +398,15 @@ export default {
 </script>
 
 <style scoped>
+<<<<<<< HEAD
   span{
    margin-right: 10px;
+=======
+  .el-card{
+    margin-bottom: 15px;
+  }
+  span{
+    margin: 10px 0 10px 10px;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>

src/views/ManufacturingCenter/ProcessingStatus/index.vue

@@ -311,6 +311,10 @@
 </template>
 <script>
 import { getNames, getMachines, getGroups, getTable, getTable2, getExport } from '@/api/ManufacturingCenter/ProcessingStatus'
+<<<<<<< HEAD
+=======
+import Cookie from 'js-cookie'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 
 export default {
   data() {
@@ -380,10 +384,27 @@ export default {
       pageCurrent: 1
     }
   },
+<<<<<<< HEAD
   created() {
     this.getMachine()
     this.getTableData()
   },
+=======
+  watch: {
+    // 如果路由有变化，会再次执行该方法
+    '$route': {
+      handler(route) {
+        const _this = this
+        if (route.name === 'ProcessingStatus') {
+          _this.getMachine()
+        }
+      }
+    }
+  },
+  // created() {
+  //   this.getMachine()
+  // },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   methods: {
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => {
@@ -412,7 +433,10 @@ export default {
         })
       })
     },
+<<<<<<< HEAD
     // 查询供应商名称
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     fetchData() {
       this.projects = []
       getNames().then(response => {
@@ -426,6 +450,7 @@ export default {
       this.part = 1
     },
     getMachine() {
+<<<<<<< HEAD
       this.Machine = ''
       this.Machines = []
       this.Group = ''
@@ -439,6 +464,45 @@ export default {
           })
         }
       })
+=======
+      if (Cookie.get('machineValue') !== undefined) {
+        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].项目名称
+            })
+          }
+        }).then(() => {
+          this.Machine = parseInt(Cookie.get('machineValue'))
+          this.getGroup()
+          this.Group = parseInt(Cookie.get('group'))
+          this.getTableData()
+          Cookie.remove('machineValue')
+          Cookie.remove('group')
+        })
+      } else {
+        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].项目名称
+            })
+          }
+        })
+        this.getTableData()
+      }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     getGroup() {
       this.Group = ''

src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue

@@ -32,10 +32,26 @@
           <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>
+      <h1 class="word" style="margin: 0">总计划:</h1>
+      <div style="border: 1px solid #ebeef5;">
+        <span>合同总数:</span>{{ 合同总数 ? 合同总数 : '-' }}&nbsp;(个)
+        <span>合同总金额:</span>{{ 合同总金额 ? 合同总金额 : '-' }}&nbsp;(万元)
+        <span>已支付:</span>{{ 已支付 ? 已支付 : '-' }}&nbsp;(万元)
+        <span>理论加工时间:</span>{{ 理论加工时间 ? 理论加工时间 : '-' }}&nbsp;(分)<br>
+        <span>实际加工时间:</span>{{ 实际加工时间 ? 实际加工时间 : '-' }}&nbsp;(分)
+        <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">
@@ -506,12 +522,26 @@
 </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
+=======
+      合同总数: '',
+      合同总金额: '',
+      已支付: '',
+      理论加工时间: '',
+      实际加工时间: '',
+      外协工时总数: '',
+      零件金额: '',
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       projectValue: '',
       projectValue1: '',
       project: [],
@@ -553,7 +583,26 @@ export default {
     this.fetchData()
     this.searchTable1()
   },
+<<<<<<< HEAD
   methods: {
+=======
+  mounted() {
+    this.searchAll()
+  },
+  methods: {
+    searchAll() {
+      this.projectValue ? this.projectValue_check = 1 : this.projectValue_check = 0
+      searchAll(this.projectValue_check, this.projectValue).then(response => {
+        this.合同总数 = response.data[0].合同总数
+        this.合同总金额 = response.data[0].合同总金额
+        this.已支付 = response.data[0].已支付
+        this.理论加工时间 = response.data[0].理论加工时间段
+        this.实际加工时间 = response.data[0].实际加工时间段
+        this.外协工时总数 = response.data[0].外协工时总数
+        this.零件金额 = response.data[0].零件金额
+      })
+    },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     colorJudge(time1, time2) {
       if (time2 === null) {
         if ((new Date(time1) - this.now) > 0 && (new Date(time1) - this.now) < (86400000 * this.warningValue)) {
@@ -605,6 +654,7 @@ 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]
             }
@@ -655,6 +705,92 @@ export default {
             }
             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 {
+              response.data.rows[i].合同签订日期 = ''
+            }
+            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 {
+              response.data.rows[i].发货节点 = ''
+            }
+            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 {
+              response.data.rows[i].设备预验收节点 = ''
+            }
+            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 {
+              response.data.rows[i].安装调试节点 = ''
+            }
+            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 {
+              response.data.rows[i].机床设计完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].采购完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].备料完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].机床生产完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].机床装配完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].机床设计实际完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].采购实际完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].备料实际完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].机床生产实际完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].机床装配实际完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].审图计划开始时间 = ''
+            }
+            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 {
+              response.data.rows[i].审图计划完成时间 = ''
+            }
+            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 {
+              response.data.rows[i].审图实际完成时间 = ''
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             }
             this.tableData10.push({
               项目编号: response.data.rows[i].项目编号,
@@ -715,7 +851,10 @@ 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]
               // }
@@ -763,7 +902,10 @@ export default {
               }
             }
             this.loading = false
+<<<<<<< HEAD
             console.log(response.data, 222222)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             this.tableData = response.data
           }).then(() => {
             searchtable2(this.machineValue1, 1).then(response => {
@@ -787,7 +929,10 @@ export default {
                 }
               }
               this.loading1 = false
+<<<<<<< HEAD
               console.log(response.data, 2)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData1 = response.data
             })
             searchtable2(this.machineValue1, 2).then(response => {
@@ -814,9 +959,13 @@ 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++) {
@@ -842,7 +991,10 @@ export default {
                 }
               }
               this.loading1 = false
+<<<<<<< HEAD
               console.log(response.data, 4)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData3 = response.data
             })
             searchtable2(this.machineValue1, 4).then(response => {
@@ -869,11 +1021,17 @@ 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)) {
@@ -897,7 +1055,10 @@ export default {
                 }
               }
               this.loading1 = false
+<<<<<<< HEAD
               console.log(response.data, 6)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               this.tableData5 = response.data
             })
           })

src/views/ManufacturingCenter/Querybd/index.vue

@@ -0,0 +1,644 @@
+<template>
+  <div>
+    <el-card>
+      <span>请选择机床：</span>
+      <el-autocomplete
+        v-model="searchCriteria"
+        :fetch-suggestions="querySearch"
+        clearable
+        style="width: 200px;margin-left: 10px"
+        size="small"
+        class="inline-input"
+        placeholder="请输入内容"
+        @clear="clearMachine"
+        @select="handleSelect"/>
+      <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>
+      <!--<el-button type="success" icon="el-icon-search" size="mini" style="margin-left: 15px" @click="searchColor">查询</el-button>-->
+    </el-card>
+    <el-card>
+      <div class="main">
+        <div class="process">
+          <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>第二行信息</div>
+              <el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='发货';update()">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[21] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='总装调试';update()">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[20] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='装配质检';update()">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[19] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='电气装配';update()">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[18] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='机械装配';update()">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[17] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='冷作';update()">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[16] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='油漆';update()">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[15] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='成组配套';update()">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[14] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='自制质检';update()">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[13] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='采购质检';update()">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[12] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='车间加工';update()">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[11] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='工序外协';update()">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[10] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='能力平衡';update()">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
+            <el-tooltip placement="top">
+              <div slot="content">第二行信息</div>
+              <el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='定额';update()">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
+            <el-tooltip placement="top">
+              <div slot="content">第二行信息</div>
+              <el-button :disabled="disabled" style="color: black;line-height:19px" type="text" @click="title='工艺';update()">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[7] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='自家备料';update()">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[0] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title = '签订合同';update()">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[1] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title = '产品设计';update()">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[6] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='外购备料';update()">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[2] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='零件分配';update()">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[3] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='自制件';update()">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[5] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='车间采购';update()">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+          <div :class="[isActive ? color[4] : 'white']" 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" style="color: black;line-height:19px" type="text" @click="title='采购部采购';update()">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
+            </el-tooltip>
+          </div>
+        </div>
+      </div>
+    </el-card>
+    <el-card style="height: 380px">
+      <el-row>
+        <h2>{{ title }}</h2>
+      </el-row>
+      <div style="margin: 0 auto;width: 400px">
+        <el-row>
+          <el-select v-model="value" placeholder="请选择" style="width: 200px" @change="select">
+            <el-option
+              v-for="item in options"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-row>
+        <el-row style="margin-top: 30px">
+          <el-input-number v-model="num" :precision="2" :step="0.1" :max="100" style="width: 200px" @blur="blur"/>
+        </el-row>
+        <el-row style="margin-top: 30px">
+          <el-button type="primary" style="width: 200px;padding-top: 12px" @click="save">保存</el-button>
+        </el-row>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>import { SelectMachine } from '@/api/ManufacturingCenter/ParseQuery'
+import request from '@/utils/request'
+export default {
+  data() {
+    return {
+      name: '',
+      name1: '',
+      num: 0,
+      options: [{
+        value: 1,
+        label: '未开始'
+      }, {
+        value: 2,
+        label: '进行中'
+      }, {
+        value: 3,
+        label: '已完成'
+      }, {
+        value: 4,
+        label: '已拖期'
+      }],
+      value: '',
+      title: '请点击查询',
+      disabled: true,
+      color: [],
+      isActive: false,
+      machineValue: '',
+      searchCriteria: '', // 机床名称 V-model
+      restaurants: [], // 机床名称数组
+      data: [{
+        签订合同百分比: 0,
+        产品设计百分比: 0,
+        零件分配百分比: 0,
+        自制件百分比: 0,
+        车间采购百分比: 0,
+        采购部采购百分比: 0,
+        自家备料百分比: 0,
+        外购备料百分比: 0,
+        工艺百分比: 0,
+        定额百分比: 0,
+        能力平衡百分比: 0,
+        工序外协百分比: 0,
+        车间加工百分比: 0,
+        自制质检百分比: 0,
+        采购质检百分比: 0,
+        成组配套百分比: 0,
+        电气装配百分比: 0,
+        机械装配百分比: 0,
+        冷作百分比: 0,
+        油漆百分比: 0,
+        装配质检百分比: 0,
+        总装调试百分比: 0,
+        发货百分比: 0
+      }] // 百分比
+    }
+  },
+  methods: {
+    select() {
+      if (this.value === 3) {
+        this.num = 100
+      }
+    },
+    blur() {
+      if (this.num === 100) {
+        this.value = 3
+      }
+    },
+    // 清空查询条件
+    clearMachine() {
+      this.num = 0
+      this.value = ''
+      this.title = '请点击查询'
+      this.machineValue = ''
+      this.isActive = false
+      this.disabled = true
+      this.data[0].签订合同百分比 = 0
+      this.data[0].产品设计百分比 = 0
+      this.data[0].零件分配百分比 = 0
+      this.data[0].自制件百分比 = 0
+      this.data[0].车间采购百分比 = 0
+      this.data[0].采购部采购百分比 = 0
+      this.data[0].自家备料百分比 = 0
+      this.data[0].外购备料百分比 = 0
+      this.data[0].工艺百分比 = 0
+      this.data[0].定额百分比 = 0
+      this.data[0].能力平衡百分比 = 0
+      this.data[0].工序外协百分比 = 0
+      this.data[0].车间加工百分比 = 0
+      this.data[0].自制质检百分比 = 0
+      this.data[0].采购质检百分比 = 0
+      this.data[0].成组配套百分比 = 0
+      this.data[0].电气装配百分比 = 0
+      this.data[0].机械装配百分比 = 0
+      this.data[0].冷作百分比 = 0
+      this.data[0].油漆百分比 = 0
+      this.data[0].装配质检百分比 = 0
+      this.data[0].总装调试百分比 = 0
+      this.data[0].发货百分比 = 0
+    },
+    // 机床名称查询函数
+    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为首字匹配
+      }
+    },
+    // 选择机床名称后的赋值函数
+    async handleSelect(item) {
+      // 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
+      this.machineValue = item.num
+      this.machineValue ? this.disabled = false : this.disabled = true
+      this.title = '请点击选择'
+      await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}`
+        }
+      }).then(res => {
+        this.isActive = true
+        this.data = res.data
+        if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
+        if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
+        if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
+        if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
+        if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
+        if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
+        if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
+        if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
+        if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
+        if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
+        if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
+        if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
+        if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
+        if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
+        if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
+        if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
+        if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
+        if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
+        if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
+        if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
+        if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
+        if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
+        if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
+      })
+    },
+    async update() {
+      if (this.title === '签订合同') { this.name1 = `select 签订合同状态,签订合同百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '产品设计') { this.name1 = `select 产品设计状态,产品设计百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '零件分配') { this.name1 = `select 零件分配状态,零件分配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自制件') { this.name1 = `select 自制件状态,自制件百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '车间采购') { this.name1 = `select 车间采购状态,车间采购百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '采购部采购') { this.name1 = `select 采购部采购状态,采购部采购百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自家备料') { this.name1 = `select 自家备料状态,自家备料百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '外购备料') { this.name1 = `select 外购备料状态,外购备料百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '工艺') { this.name1 = `select 工艺状态,工艺百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '定额') { this.name1 = `select 定额状态,定额百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '能力平衡') { this.name1 = `select 能力平衡状态,能力平衡百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '工序外协') { this.name1 = `select 工序外协状态,工序外协百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '车间加工') { this.name1 = `select 车间加工状态,车间加工百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自制质检') { this.name1 = `select 自制质检状态,自制质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '采购质检') { this.name1 = `select 采购质检状态,采购质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '成组配套') { this.name1 = `select 成组配套状态,成组配套百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '电气装配') { this.name1 = `select 电气装配状态,电气装配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '机械装配') { this.name1 = `select 机械装配状态,机械装配百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '冷作') { this.name1 = `select 冷作状态,冷作百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '油漆') { this.name1 = `select 油漆状态,油漆百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '装配质检') { this.name1 = `select 装配质检状态,装配质检百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '总装调试') { this.name1 = `select 总装调试状态,总装调试百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '发货') { this.name1 = `select 发货状态,发货百分比 from 综合查询_状态 where 机床流水号 = ${this.machineValue}` }
+      await request({
+        url: '',
+        method: 'post',
+        data: {
+          type: '3',
+          name: this.name1
+        }
+      }).then(res => {
+        switch (this.title) {
+          case '签订合同':
+            this.value = res.data[0].签订合同状态
+            this.num = res.data[0].签订合同百分比
+            break
+          case '产品设计':
+            this.value = res.data[0].产品设计状态
+            this.num = res.data[0].产品设计百分比
+            break
+          case '零件分配':
+            this.value = res.data[0].零件分配状态
+            this.num = res.data[0].零件分配百分比
+            break
+          case '自制件':
+            this.value = res.data[0].自制件状态
+            this.num = res.data[0].自制件百分比
+            break
+          case '车间采购':
+            this.value = res.data[0].车间采购状态
+            this.num = res.data[0].车间采购百分比
+            break
+          case '采购部采购':
+            this.value = res.data[0].采购部采购状态
+            this.num = res.data[0].采购部采购百分比
+            break
+          case '自家备料':
+            this.value = res.data[0].自家备料状态
+            this.num = res.data[0].自家备料百分比
+            break
+          case '外购备料':
+            this.value = res.data[0].外购备料状态
+            this.num = res.data[0].外购备料百分比
+            break
+          case '工艺':
+            this.value = res.data[0].工艺状态
+            this.num = res.data[0].工艺百分比
+            break
+          case '定额':
+            this.value = res.data[0].定额状态
+            this.num = res.data[0].定额百分比
+            break
+          case '能力平衡':
+            this.value = res.data[0].能力平衡状态
+            this.num = res.data[0].能力平衡百分比
+            break
+          case '工序外协':
+            this.value = res.data[0].工序外协状态
+            this.num = res.data[0].工序外协百分比
+            break
+          case '车间加工':
+            this.value = res.data[0].车间加工状态
+            this.num = res.data[0].车间加工百分比
+            break
+          case '自制质检':
+            this.value = res.data[0].自制质检状态
+            this.num = res.data[0].自制质检百分比
+            break
+          case '采购质检':
+            this.value = res.data[0].采购质检状态
+            this.num = res.data[0].采购质检百分比
+            break
+          case '成组配套':
+            this.value = res.data[0].成组配套状态
+            this.num = res.data[0].成组配套百分比
+            break
+          case '电气装配':
+            this.value = res.data[0].电气装配状态
+            this.num = res.data[0].电气装配百分比
+            break
+          case '机械装配':
+            this.value = res.data[0].机械装配状态
+            this.num = res.data[0].机械装配百分比
+            break
+          case '冷作':
+            this.value = res.data[0].冷作状态
+            this.num = res.data[0].冷作百分比
+            break
+          case '油漆':
+            this.value = res.data[0].油漆状态
+            this.num = res.data[0].油漆百分比
+            break
+          case '装配质检':
+            this.value = res.data[0].装配质检状态
+            this.num = res.data[0].装配质检百分比
+            break
+          case '总装调试':
+            this.value = res.data[0].总装调试状态
+            this.num = res.data[0].总装调试百分比
+            break
+          case '发货':
+            this.value = res.data[0].发货状态
+            this.num = res.data[0].发货百分比
+            break
+          default:
+        }
+      })
+    },
+    async save() {
+      if (this.title === '签订合同') { this.name = `update 综合查询_状态 set 签订合同状态 = ${this.value},签订合同百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '产品设计') { this.name = `update 综合查询_状态 set 产品设计状态 = ${this.value},产品设计百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '零件分配') { this.name = `update 综合查询_状态 set 零件分配状态 = ${this.value},零件分配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自制件') { this.name = `update 综合查询_状态 set 自制件状态 = ${this.value},自制件百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '车间采购') { this.name = `update 综合查询_状态 set 车间采购状态 = ${this.value},车间采购百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '采购部采购') { this.name = `update 综合查询_状态 set 采购部采购状态 = ${this.value},采购部采购百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自家备料') { this.name = `update 综合查询_状态 set 自家备料状态 = ${this.value},自家备料百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '外购备料') { this.name = `update 综合查询_状态 set 外购备料状态 = ${this.value},外购备料百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '工艺') { this.name = `update 综合查询_状态 set 工艺状态 = ${this.value},工艺百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '定额') { this.name = `update 综合查询_状态 set 定额状态 = ${this.value},定额百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '能力平衡') { this.name = `update 综合查询_状态 set 能力平衡状态 = ${this.value},能力平衡百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '工序外协') { this.name = `update 综合查询_状态 set 工序外协状态 = ${this.value},工序外协百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '车间加工') { this.name = `update 综合查询_状态 set 车间加工状态 = ${this.value},车间加工百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '自制质检') { this.name = `update 综合查询_状态 set 自制质检状态 = ${this.value},自制质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '采购质检') { this.name = `update 综合查询_状态 set 采购质检状态 = ${this.value},采购质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '成组配套') { this.name = `update 综合查询_状态 set 成组配套状态 = ${this.value},成组配套百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '电气装配') { this.name = `update 综合查询_状态 set 电气装配状态 = ${this.value},电气装配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '机械装配') { this.name = `update 综合查询_状态 set 机械装配状态 = ${this.value},机械装配百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '冷作') { this.name = `update 综合查询_状态 set 冷作状态 = ${this.value},冷作百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '油漆') { this.name = `update 综合查询_状态 set 油漆状态 = ${this.value},油漆百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '装配质检') { this.name = `update 综合查询_状态 set 装配质检状态 = ${this.value},装配质检百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '总装调试') { this.name = `update 综合查询_状态 set 总装调试状态 = ${this.value},总装调试百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title === '发货') { this.name = `update 综合查询_状态 set 发货状态 = ${this.value},发货百分比= ${this.num} where 机床流水号 = ${this.machineValue}` }
+      if (this.title !== '请点击查询') {
+        await request({
+          url: '',
+          method: 'post',
+          data: {
+            type: '3',
+            name: this.name
+          }
+        }).then(res => {
+          console.log(res)
+          if (res.data.length === 0) {
+            this.$message.success('保存成功')
+          } else {
+            this.$message.error('保存失败')
+          }
+        }).then(() => {
+          request({
+            url: '',
+            method: 'post',
+            data: {
+              type: '3',
+              name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}`
+            }
+          }).then(res => {
+            this.isActive = true
+            this.data = res.data
+            if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
+            if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
+            if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
+            if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
+            if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
+            if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
+            if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
+            if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
+            if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
+            if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
+            if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
+            if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
+            if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
+            if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
+            if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
+            if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
+            if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
+            if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
+            if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
+            if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
+            if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
+            if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
+            if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
+          })
+        })
+      } else {
+        this.$message.error('请选择节点')
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .red{
+    background: red;
+  }
+  .yellow{
+    background: orange;
+  }
+  .green{
+    background: lightgreen;
+  }
+  .white{
+    background: white;
+  }
+  .el-card{
+    margin: 5px 10px 5px 10px;
+  }
+  .showDiv{
+    height: 380px;
+  }
+  .module{
+    border-radius: 6px;
+    border: 1px solid black;
+    /*background-color: white;*/
+    display: inline-block;
+  }
+  .module:hover{
+    box-shadow: 5px 5px 5px #888888;/*设置阴影,可以自定义参数*/
+  }
+  .process{
+    text-align: center;
+    margin-left: 80px;
+    margin-top: 20px;
+    width: 1858px;
+    height: 400px;
+    /*border: 1px solid red;*/
+    background: url('../../../assets/img/img4.png') repeat;
+    background-repeat:no-repeat;
+    background-size:100% 100%;-moz-background-size:100% 100%;
+  }
+  .main{
+    border: 1px solid  #DCDFE6;
+    width:100%;
+    overflow-y: hidden;
+    overflow-x: auto;
+    color: #000;
+    font-size: 16px;
+    height: 440px;
+  }
+  .main p{height:300px;}
+  /*-------滚动条整体样式----*/
+  .main::-webkit-scrollbar {
+    width:8px;
+    height:8px;
+  }
+  /*滚动条里面小方块样式*/
+  .main::-webkit-scrollbar-thumb {
+    border-radius:100px;
+    -webkit-box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+    background:#DCDFE6;
+  }
+  /*滚动条里面轨道样式*/
+  .main::-webkit-scrollbar-track {
+    -webkit-box-shadow:inset 0 0 5px rgba(0,0,0,0.2);
+    border-radius:0;
+    background:white;
+  }
+  .red{
+    background: red;
+  }
+  .el-button{
+    padding-top: 5px;
+  }
+</style>

src/views/ManufacturingCenter/RepairTimeEntry/index.vue

@@ -1,5 +1,6 @@
 <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"/>
@@ -9,32 +10,68 @@
 
     <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>
@@ -44,6 +81,7 @@
             {{ 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">
@@ -65,6 +103,20 @@
                   @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>
@@ -186,7 +238,11 @@
             @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.考勤编号 }}
@@ -202,7 +258,11 @@
               {{ 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>
@@ -260,7 +320,11 @@ export default {
       count1: 0, // 清表单验证计数器
       count2: 0, // 清表单验证计数器
       tableData: [], // 表格数据
+<<<<<<< HEAD
       pageSize: 20,
+=======
+      pageSize: 10,
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       pageCurrent: 1,
       total: 0,
       dialogFormVisible: false,
@@ -466,7 +530,11 @@ export default {
         if (this.count1 !== 1) {
           this.$refs[formName].resetFields()
         }
+<<<<<<< HEAD
         this.title1 = '新增修补工时'
+=======
+        this.title1 = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         this.dialogFormVisible = true
       }
     },
@@ -478,7 +546,11 @@ 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 {
@@ -506,7 +578,11 @@ export default {
       this.form.timeNumber = row.修补工时
       this.form.修补工艺 = row.修补工艺
       this.dialogFormVisible = true
+<<<<<<< HEAD
       this.title1 = '编辑修补工时'
+=======
+      this.title1 = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     // 编辑确定
     handleChange() {
@@ -554,7 +630,13 @@ export default {
 </script>
 
 <style scoped>
+<<<<<<< HEAD
   /*.el-card{*/
   /*  margin-bottom: 15px;*/
   /*}*/
+=======
+  .el-card{
+    margin-bottom: 15px;
+  }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>

src/views/ManufacturingCenter/SparePartsForScrap/index.vue

@@ -237,7 +237,11 @@
       </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"/>
@@ -320,7 +324,10 @@ export default {
       MachineDrawing: [], // 机床图号下拉框
       TeamValue: '', // 组号
       Team: [], // 组号下拉框
+<<<<<<< HEAD
       title: '',
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       currentPage1: 1,
       pageSize1: 10,
       total1: null,
@@ -445,8 +452,12 @@ export default {
       this.remark1 = ''
       this.remark2 = ''
       this.form2.reason = ''
+<<<<<<< HEAD
       this.title = row.零件名称
       this.form2.time = new Date()
+=======
+      this.form2.time = ''
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号
       if (row.批次零件状态 === '2') {

src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue

@@ -85,12 +85,17 @@
         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">
@@ -257,7 +262,11 @@ export default {
       if (this.$refs['form'] !== undefined) {
         this.$refs['form'].resetFields()
       }
+<<<<<<< HEAD
       this.title = '新增车间设备'
+=======
+      this.title = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form = {
         设备名称: '',
         设备编号: '',
@@ -276,7 +285,11 @@ 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.设备编号

src/views/MarketingCenter/BidBond/index.vue

@@ -4,10 +4,17 @@
     <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"
@@ -15,7 +22,11 @@
           :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"
@@ -41,6 +52,7 @@
       <el-table
         v-loading="tableData1Loading"
         :data="tableData1"
+<<<<<<< HEAD
         style="width: 100%; margin-top: 3px"
         height="770"
         highlight-current-row=""
@@ -48,6 +60,13 @@
         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>
@@ -55,7 +74,11 @@
             </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>
@@ -70,7 +93,11 @@
             {{ 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>
@@ -140,6 +167,7 @@
             {{ 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">
@@ -189,6 +217,38 @@
         </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]"
@@ -213,7 +273,11 @@
             @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.考勤编号 }}
@@ -241,7 +305,11 @@
     </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
@@ -301,7 +369,11 @@
           </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>
@@ -684,7 +756,11 @@ export default {
     },
     addBidBond() {
       this.addForm('form2')
+<<<<<<< HEAD
       this.title = '新增投标保证金'
+=======
+      this.title = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible2 = true
     },
     addTableData1() {
@@ -701,7 +777,11 @@ export default {
     },
     editBidBond(row) {
       this.editForm(row, 'form2')
+<<<<<<< HEAD
       this.title = '编辑投标保证金'
+=======
+      this.title = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible2 = true
       this.form2.招标企业 = row.招标企业
       this.form2.联系人 = row.联系人

src/views/MarketingCenter/CRM/index.vue

@@ -2,7 +2,11 @@
   <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"
@@ -21,11 +25,20 @@
       <!--: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.省份 }}-->
@@ -51,6 +64,7 @@
             {{ 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">
@@ -72,18 +86,37 @@
                   @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;"
@@ -91,11 +124,23 @@
             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>
@@ -103,36 +148,65 @@
           </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>
@@ -142,12 +216,20 @@
                 {{ 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>
@@ -157,11 +239,16 @@
                 {{ 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">
@@ -183,6 +270,20 @@
                       @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>
@@ -224,7 +325,11 @@
             @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.考勤编号 }}
@@ -530,7 +635,11 @@ export default {
     },
     addMarketingManager() {
       this.dialogFormVisible1 = true
+<<<<<<< HEAD
       this.title1 = '新增营销经理'
+=======
+      this.title1 = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.addForm('form1')
     },
     callOff1() {
@@ -603,7 +712,11 @@ export default {
     },
     handleEditMarketingManager(row) {
       this.dialogFormVisible1 = true
+<<<<<<< HEAD
       this.title1 = '编辑营销经理'
+=======
+      this.title1 = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form1.营销经理 = row.姓名
       this.peopleid = row.营销经理流水号
       this.a = row.营销经理地区流水号
@@ -614,7 +727,11 @@ 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].省份
@@ -625,7 +742,11 @@ export default {
     },
     handleEdit(row) {
       this.dialogFormVisible2 = true
+<<<<<<< HEAD
       this.title2 = '编辑客户'
+=======
+      this.title2 = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.form2.省份 = row.省份
       this.form2.客户名称 = row.客户名称
       this.form2.联系电话 = row.电话

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -2,7 +2,11 @@
   <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"
@@ -12,7 +16,11 @@
       <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"
@@ -39,6 +47,7 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         highlight-current-row
+<<<<<<< HEAD
         style="width: 100%; margin-top: 3px"
         height="600"
         border
@@ -49,6 +58,17 @@
         <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.机床图号 }}
@@ -62,14 +82,22 @@
             </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>
@@ -104,33 +132,57 @@
             {{ 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]"
@@ -144,17 +196,28 @@
 
     <!--营销经理选择-->
     <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>
@@ -173,6 +236,7 @@
     </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>
@@ -183,6 +247,17 @@
               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">
@@ -244,6 +319,7 @@
             </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"
@@ -252,13 +328,26 @@
               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>
@@ -306,16 +395,26 @@
             </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="发货单号">
@@ -366,6 +465,7 @@
             </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"
@@ -374,6 +474,15 @@
               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">
@@ -471,15 +580,25 @@
             </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">
@@ -544,6 +663,7 @@
             </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"
@@ -552,6 +672,15 @@
               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">

src/views/MarketingCenter/ContractCapitalManagement/index.vue

@@ -2,19 +2,32 @@
   <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>
@@ -23,6 +36,7 @@
         :row-key="getRowKeys"
         :expand-row-keys="expands"
         :data="tableData1"
+<<<<<<< HEAD
         style="width: 100%;"
         height="500px"
         highlight-current-row
@@ -35,6 +49,19 @@
           <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>
@@ -52,78 +79,138 @@
             </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">
@@ -150,6 +237,25 @@
         </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]"
@@ -167,6 +273,7 @@
         :row-key="getRowKeys1"
         :expand-row-keys="expands1"
         :data="tableData2"
+<<<<<<< HEAD
         style="width: 100%;max-height: 440px;text-align: center"
         height="210"
         highlight-current-row
@@ -177,6 +284,17 @@
         <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="序号"
@@ -194,6 +312,7 @@
               </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
@@ -213,6 +332,18 @@
                         @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>
@@ -233,19 +364,33 @@
             {{ 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"
@@ -254,6 +399,7 @@
             </el-select>
           </template>
         </el-table-column>
+<<<<<<< HEAD
         <el-table-column align="center" label="截止时间" width="200px">
           <template slot-scope="scope">
             <span>后</span>
@@ -262,6 +408,16 @@
           </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"
@@ -285,6 +441,7 @@
             </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">
@@ -314,6 +471,38 @@
     </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">
@@ -337,7 +526,11 @@
       </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">
@@ -361,7 +554,11 @@
       </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="请输入项目名称"/>
@@ -399,10 +596,17 @@
       </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-->
@@ -412,7 +616,11 @@
       <!--: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.姓名 }}
@@ -431,7 +639,11 @@
       </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"/>
@@ -452,7 +664,11 @@
       </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"/>
@@ -473,14 +689,24 @@
       </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>
@@ -490,7 +716,11 @@
             {{ 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>
@@ -510,6 +740,7 @@
             {{ 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">
@@ -531,6 +762,18 @@
                   @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>
@@ -833,7 +1076,11 @@ 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.本次收款金额
@@ -1220,7 +1467,11 @@ 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
@@ -1685,22 +1936,33 @@ 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;
@@ -1724,5 +1986,7 @@ export default {
     tr.el-table__row.el-table__row--striped td {
       background: #e9f0f9 !important;
     }
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>

src/views/MarketingCenter/ContractInformationManagement/index.vue

@@ -1,9 +1,16 @@
 <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"
@@ -12,10 +19,17 @@
         </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"
@@ -27,7 +41,11 @@
         <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"
@@ -42,6 +60,7 @@
         :data="tableData1"
         :row-key="getRowKeys"
         :expand-row-keys="expands"
+<<<<<<< HEAD
         highlight-current-row
         style="width: 100%;margin: 3px 0px"
         height="500"
@@ -54,11 +73,27 @@
           <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>
@@ -68,6 +103,7 @@
                   {{ 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">
@@ -96,85 +132,166 @@
           </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
@@ -206,12 +323,38 @@
         </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"/>
@@ -219,7 +362,11 @@
     </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">
@@ -246,7 +393,11 @@
       </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"
@@ -256,7 +407,11 @@
           :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">
@@ -277,7 +432,11 @@
       </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">
@@ -302,7 +461,11 @@
             </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>
@@ -391,7 +554,11 @@
     </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"/>
@@ -410,10 +577,17 @@
     </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-->
@@ -423,7 +597,11 @@
       <!--: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.姓名 }}
@@ -443,7 +621,11 @@
     </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>
@@ -454,7 +636,10 @@
           style="width: 100%"
           height="400"
           border
+<<<<<<< HEAD
           stripe
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           size="mini"
           @row-click="biddingNum">
           <el-table-column align="center" label="招标企业" width="300">
@@ -509,7 +694,11 @@
     <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.省份 }}
@@ -536,7 +725,10 @@
         :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"/>
@@ -547,7 +739,11 @@
     </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
@@ -922,7 +1118,11 @@ export default {
       this.addForm('form')
       this.dialogFormVisible1 = true
       this.temp = 1
+<<<<<<< HEAD
       this.title = '新增合同'
+=======
+      this.title = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.disabled = false
       this.biddingNumber = ''
       this.tableDataBidding = []
@@ -962,7 +1162,11 @@ 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.合同编号
@@ -1120,13 +1324,21 @@ 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.机床名称
@@ -1278,9 +1490,15 @@ 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;
 }
@@ -1312,7 +1530,11 @@ export default {
 }
 .delete:hover{
   background: -webkit-linear-gradient(top,#0ba9e3,#0099d3);
+<<<<<<< HEAD
   color: #ff0511;
+=======
+  color: #fff;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 }
 a{
   text-decoration: none;
@@ -1338,6 +1560,7 @@ a{
   border: 1px solid black!important;
 }
 </style>
+<<<<<<< HEAD
 <style lang="scss">
   .subTableHeader {
     th {
@@ -1354,3 +1577,5 @@ a{
     }
   }
 </style>
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

src/views/MarketingCenter/CreateProject/index.vue

@@ -3,13 +3,18 @@
     <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>
@@ -18,14 +23,31 @@
         <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"
@@ -41,12 +63,20 @@
         :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">
@@ -81,29 +111,49 @@
             </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"
@@ -148,7 +198,10 @@
               <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"
@@ -175,9 +228,12 @@
 
     <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>
@@ -198,7 +254,10 @@
 
 <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: {
@@ -241,7 +300,10 @@ export default {
       dialogFormVisible2: false,
       title1: '',
       form1: {
+<<<<<<< HEAD
         项目名称: '',
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         设备型号: '',
         设备名称: '',
         机床数量: 1
@@ -306,9 +368,14 @@ 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) {
@@ -342,7 +409,11 @@ 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.合同编号
@@ -368,9 +439,14 @@ 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() {
@@ -397,7 +473,11 @@ 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.机床名称

src/views/MarketingCenter/DeliveryApplication/index.vue

@@ -3,7 +3,11 @@
     <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>
@@ -40,7 +44,11 @@
         <!--<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">
@@ -69,7 +77,11 @@
                   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
@@ -94,7 +106,11 @@
                   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
@@ -119,7 +135,11 @@
                   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
@@ -139,7 +159,11 @@
                   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
@@ -159,7 +183,11 @@
                   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
@@ -284,7 +312,11 @@
         :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">
@@ -333,7 +365,11 @@
               :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>
@@ -462,7 +498,10 @@
               style="width: 100%"
               height="200"
               border
+<<<<<<< HEAD
               stripe
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
               size="mini"
               @selection-change="handleSelectionChangeMachine">
               <el-table-column
@@ -578,7 +617,11 @@
               {{ 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>
@@ -1202,15 +1245,22 @@ 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,
@@ -1221,4 +1271,10 @@ export default {
   .clearfix:after {
     clear: both
   }
+<<<<<<< HEAD
+=======
+  .el-card{
+    margin-top: 2px;
+  }
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
 </style>

src/views/MarketingCenter/InvoiceRecord/index.vue

@@ -3,14 +3,22 @@
     <!--查询条件-->
     <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
@@ -36,6 +44,7 @@
         v-loading="listLoading1"
         :data="tableData1"
         highlight-current-row
+<<<<<<< HEAD
         style="width: 100%;margin-top: 3px"
         height="460"
         border
@@ -48,16 +57,37 @@
           </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>
@@ -67,6 +97,7 @@
             {{ 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>
@@ -77,11 +108,27 @@
           <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="合同信息备注">
@@ -93,20 +140,31 @@
           <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>
@@ -118,18 +176,28 @@
         :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>
@@ -159,12 +227,20 @@
             {{ 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>
@@ -174,6 +250,7 @@
             {{ 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">
@@ -195,6 +272,20 @@
                   @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>
@@ -204,7 +295,11 @@
     <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-->
@@ -213,8 +308,13 @@
       <!--: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.姓名 }}
@@ -301,16 +401,27 @@
       </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>
@@ -331,7 +442,10 @@
         :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"/>
@@ -430,9 +544,13 @@ export default {
     },
     openName() {
       this.name = ''
+<<<<<<< HEAD
       SelectMarketingManager(this.name).then(response => {
         this.dataPeople = response.data
       })
+=======
+      this.dataPeople = []
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisiblePeople = true
     },
     // 初始化条件
@@ -572,12 +690,19 @@ 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() {
@@ -651,7 +776,11 @@ export default {
     },
     openEditInvoiceRecordingDialog(row) {
       this.editForm(row, 'form')
+<<<<<<< HEAD
       this.title = '编辑开票记录'
+=======
+      this.title = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.CustomerCode = row.客户流水号
       this.form.客户名称 = row.客户名称
@@ -699,10 +828,15 @@ 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>

src/views/MarketingCenter/PerformanceBond/index.vue

@@ -2,7 +2,11 @@
   <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"
@@ -32,6 +36,7 @@
       <el-table
         v-loading="listLoading1"
         :data="tableData1"
+<<<<<<< HEAD
         style="width: 100%;margin-top: 3px;"
         height="600"
         border
@@ -45,6 +50,20 @@
           </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>
@@ -54,27 +73,47 @@
             {{ 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>
@@ -84,24 +123,40 @@
             {{ 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]"
@@ -114,14 +169,23 @@
     </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="履约保证金金额">
@@ -179,6 +243,7 @@
                   </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">
@@ -213,13 +278,36 @@
                         @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"
@@ -528,7 +616,11 @@ export default {
     },
     openPerformanceBondDialog(row) {
       this.addForm('form2')
+<<<<<<< HEAD
       this.title1 = '新增履约保证金'
+=======
+      this.title1 = '增加履约保证金'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.projectId = row.项目流水号
       this.tableData2 = []

src/views/MarketingCenter/SafetyMargin/index.vue

@@ -3,7 +3,11 @@
     <!--顶栏结构-->
     <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"
@@ -33,6 +37,7 @@
       <el-table
         v-loading="listLoadingProject"
         :data="projectTableData"
+<<<<<<< HEAD
         style="width: 100%;margin-top: 3px;"
         height="650"
         border
@@ -46,6 +51,20 @@
           </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>
@@ -55,49 +74,85 @@
             {{ 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]"
@@ -111,13 +166,22 @@
 
     <!--安全保证金表格-->
     <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">-->
@@ -209,6 +273,7 @@
             {{ 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">
@@ -254,6 +319,34 @@
                   @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>
@@ -268,9 +361,72 @@
           @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">
@@ -335,7 +491,11 @@
     </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">
@@ -388,7 +548,11 @@
     </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">
@@ -436,7 +600,11 @@
     </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/>
@@ -460,6 +628,7 @@
         <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">
       <!--扣款记录表格-->
@@ -522,6 +691,8 @@
         </div>
       </el-card>
     </el-dialog>
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   </div>
 </template>
 
@@ -588,7 +759,10 @@ export default {
       dialogFormVisible2: false,
       dialogFormVisible3: false,
       dialogFormVisible4: false,
+<<<<<<< HEAD
       dialogFormVisible5: false,
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       form: {
         备注: '',
         项目名称: '',
@@ -729,7 +903,10 @@ 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
@@ -754,7 +931,11 @@ export default {
       this.fetchTableData2()
     },
     addSafetyMargin(row) {
+<<<<<<< HEAD
       this.title = '新增安全保证金'
+=======
+      this.title = '增加'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.timetime = row.合同签订日期
       this.changeTime()
       this.dialogFormVisible1 = true
@@ -763,7 +944,11 @@ export default {
     },
     editSafetyMargin(row) {
       this.editForm(row, 'form')
+<<<<<<< HEAD
       this.title = '编辑安全保证金'
+=======
+      this.title = '编辑'
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       this.dialogFormVisible1 = true
       this.form.保证金金额 = row.保证金金额
       this.form.交付日期 = row.交付日期

src/views/PurchasingCenter/CreateInquirySheet/Export2Excel.js

@@ -1,7 +1,12 @@
 /* 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');
@@ -145,6 +150,7 @@ export function export_table_to_excel(id) {
 }
 
 export function export_json_to_excel({
+<<<<<<< HEAD
   headerGroup,
   dataGroup,
   sheetGroup,
@@ -213,6 +219,72 @@ export function export_json_to_excel({
     wb.SheetNames.push(ws_name);
     wb.Sheets[ws_name] = ws;
   }
+=======
+  multiHeader = [],
+  header,
+  data,
+  filename,
+  merges = [],
+  autoWidth = true,
+  bookType=  'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header);
+
+  for (let i = multiHeader.length-1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
+  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;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   var wbout = XLSX.write(wb, {
     bookType: bookType,
     bookSST: false,

src/views/PurchasingCenter/CreateInquirySheet/index.vue

@@ -706,11 +706,28 @@
     <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">
+          <el-select v-model="form2.supplierNameValue" style="width:200px" placeholder="供应商" size="small" filterable>
+            <el-option
+              v-for="item in supplierNames"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </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>-->
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogVisible2=false">取消</el-button>
@@ -718,7 +735,11 @@
           v-show="title2==='创建询价单'"
           type="primary"
           size="small"
+<<<<<<< HEAD
           @click="submitCreateInquirySheet">确定</el-button>
+=======
+          @click="submitCreateInquirySheet1">确定</el-button>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-button
           v-show="title2==='编辑询价单'"
           type="primary"
@@ -857,7 +878,11 @@
 </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'
@@ -869,6 +894,10 @@ export default {
   name: '', // 创建询价单
   data() {
     return {
+<<<<<<< HEAD
+=======
+      supplierNames: [], // 供应商下拉框
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       switchValue: false, // 物料变更列显示开关
       source: [
         {
@@ -992,11 +1021,21 @@ export default {
         inquirySheetNumValue: '', // 询价单流水号
         inquirySheetNum: '',
         supplierName: '',
+<<<<<<< HEAD
         supplierValue: ''
       },
       rules2: { // 表单验证规则
         inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
         supplierName: [{ required: true, message: '请选择供应商' }]
+=======
+        supplierValue: '',
+        supplierNameValue: ''
+      },
+      rules2: { // 表单验证规则
+        inquirySheetNum: [{ required: true, message: '请填写询价单号' }],
+        supplierName: [{ required: true, message: '请选择供应商' }],
+        supplierNameValue: [{ required: true, message: '请选择供应商', trigger: 'change' }]
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       },
       groupPartNum: [], // 组件零件流水号
       groupPartBasicNum: [], // 组件零件基本件流水号
@@ -1284,6 +1323,17 @@ 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({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     projectChange() {
       this.machine = []
@@ -1460,15 +1510,29 @@ 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 = ''
+        this.form2.supplierNameValue = ''
+        this.form2.supplierName = ''
+        this.dialogVisible2 = true
+      })
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     submitCreateInquirySheet() { // 提交创建询价单
       this.$refs['form2'].validate((valid) => {
@@ -1482,7 +1546,11 @@ 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 = ''
@@ -1500,6 +1568,27 @@ export default {
         }
       })
     },
+<<<<<<< HEAD
+=======
+    submitCreateInquirySheet1() { // 提交创建询价单
+      this.$refs['form2'].validate((valid) => {
+        if (valid) {
+          createInquirySheet(this.form2.inquirySheetNum, this.id, this.form2.supplierNameValue, '').then(response => {
+            console.log(response.data)
+            if (response.data[0].result === '1') {
+              this.$message.success('创建成功')
+              this.form2.supplierNameValue = ''
+              this.inquirySheetNum = ''
+              this.supplierName = ''
+              this.supplierValue = ''
+              this.dialogVisible2 = false
+              this.searchTable2()
+            } else { this.$message.error('操作失败') }
+          })
+        }
+      })
+    },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     deleteInquirySheet(row) { // 删除询价单
       this.$confirm('确定删除该询价单?', '提示', {
         confirmButtonText: '确定',

src/views/PurchasingCenter/CreatePurchaseContract/index.vue

@@ -135,13 +135,21 @@
         </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>
@@ -693,7 +701,11 @@ 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.组号,

src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue

@@ -221,6 +221,7 @@
               <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
@@ -236,6 +237,23 @@
               <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-->
+          <!--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>-->
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -316,11 +334,18 @@
 </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() {
@@ -428,9 +453,22 @@ 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('增加成功')
+              this.dialogVisible1 = false
+              this.searchTable1()
+            } else {
+              this.$message.error('增加失败')
+            }
+          })
+        } else {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -448,7 +486,10 @@ export default {
             } else { this.$message.error('编辑失败') }
           })
         } else {
+<<<<<<< HEAD
           console.log('error submit!!')
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -490,6 +531,7 @@ export default {
         })
       })
     },
+<<<<<<< HEAD
     async searchPic(row, i) {
       const { data } = await request({
         url: '',
@@ -500,6 +542,9 @@ export default {
         }
       })
       this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
+=======
+    searchPic(row, i) {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     warningExceed() {
       this.$message.error('仅可上传一张发票')

src/views/PurchasingCenter/MaterialManagement/index.vue

@@ -2,13 +2,21 @@
   <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"
@@ -17,13 +25,21 @@
               :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"
@@ -32,32 +48,58 @@
               :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">
@@ -65,7 +107,11 @@
           <el-select
             v-model="MeasurementUnitValue"
             placeholder="请选择"
+<<<<<<< HEAD
             style="margin-bottom: 3px;margin-top: 10px"
+=======
+            style="margin-bottom: 10px;"
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             size="small"
             clearable>
             <el-option
@@ -80,7 +126,11 @@
           <el-select
             v-model="MaterialSourceValue"
             placeholder="请选择"
+<<<<<<< HEAD
             style="margin-bottom: 3px;margin-top: 10px"
+=======
+            style="margin-bottom: 10px;"
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
             size="small"
             clearable>
             <el-option
@@ -96,7 +146,11 @@
             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>
@@ -108,19 +162,28 @@
             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"
@@ -130,6 +193,16 @@
         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.物料名称 }}
@@ -155,6 +228,7 @@
             {{ 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">
@@ -178,6 +252,24 @@
                   @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>
@@ -498,7 +590,11 @@ export default {
       param: 0,
       tableData: [],
       pageCurrent: 1,
+<<<<<<< HEAD
       pageSize: 30,
+=======
+      pageSize: 10,
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       total: null,
       tableData1: [],
       pageCurrent1: 1,

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -157,6 +157,16 @@
             {{ 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>
+            <el-button v-else-if="Number(scope.row.是否未通过)===1&&Number(scope.row.不通过处理)===0" type="primary" size="mini" @click="done(scope.row)">点击处理完成</el-button>
+            <span v-else>—</span>
+          </template>
+        </el-table-column>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column label="采购员" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
@@ -195,7 +205,11 @@
 </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'
@@ -270,6 +284,29 @@ export default {
     this.searchTable1()
   },
   methods: {
+<<<<<<< HEAD
+=======
+    // 处理完成
+    done(row) {
+      this.$confirm('确定处理完成?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        handleDone(row.采购合同流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('操作成功')
+            this.searchTable1()
+          } else { this.$message.error('操作失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消操作'
+        })
+      })
+    },
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     deleteContract(row) { // 删除合同
       this.$confirm('此操作将永久删除合同所有内容，确定删除?', '提示', {
         confirmButtonText: '确定',

src/views/PurchasingCenter/PurchaseMaterielModify/index.vue

@@ -1,7 +1,11 @@
 <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">
@@ -89,7 +93,11 @@ export default {
       loading1: false,
       tableData1: [], // 表格数据
       total1: null, // 总条数
+<<<<<<< HEAD
       pageSize1: 30, // 每页显示条数
+=======
+      pageSize1: 10, // 每页显示条数
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
       pageCurrent1: 1
     }
   },

src/views/TechnologyCenter/CreatePackingList/index.vue

@@ -1,25 +1,41 @@
 <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="装箱单号"
@@ -54,6 +70,7 @@
           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">
@@ -75,28 +92,56 @@
                   @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
@@ -168,6 +213,7 @@
           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">
@@ -189,22 +235,47 @@
                   @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"
@@ -237,6 +308,7 @@
           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">
@@ -258,17 +330,38 @@
                   @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"
@@ -281,15 +374,34 @@
         <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>
@@ -314,6 +426,24 @@
                   @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>

src/views/TechnologyCenter/ImportChangeParts/index.vue

@@ -5,7 +5,11 @@
         <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"

src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue

@@ -1,7 +1,11 @@
 <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
@@ -10,7 +14,11 @@
             :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"
@@ -18,9 +26,15 @@
             :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>
@@ -34,33 +48,53 @@
         :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>
@@ -85,31 +119,53 @@
             {{ 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>
@@ -133,9 +189,13 @@
         style="width: 100%"
         size="mini"
         highlight-current-row
+<<<<<<< HEAD
         height="150"
         border
         stripe>
+=======
+        border>
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         <el-table-column
           label="序号"
           align="center"
@@ -762,9 +822,16 @@ export default {
 
 <style scoped>
   span{
+<<<<<<< HEAD
     margin: 3px;
   }
   radio {
     margin-left: 3px;
+=======
+    margin: 10px;
+  }
+  .radio {
+    margin-left: 10px;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   }
 </style>

src/views/TechnologyCenter/ImportParts/index.vue

@@ -1,11 +1,19 @@
 <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"
@@ -20,7 +28,11 @@
                 :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>
@@ -30,7 +42,11 @@
           </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>

src/views/TechnologyCenter/ImportParts/specificationData.vue

@@ -3,7 +3,11 @@
     <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"
@@ -18,9 +22,15 @@
             :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>
@@ -35,8 +45,11 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
+<<<<<<< HEAD
         stripe
         height="280px"
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         highlight-current-row
         @row-click="searchMaterial1">
         <el-table-column
@@ -44,6 +57,7 @@
           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>
@@ -51,11 +65,24 @@
           </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>
@@ -65,7 +92,11 @@
             {{ 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>
@@ -115,7 +146,11 @@
         <!--</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]"
@@ -132,10 +167,15 @@
         :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"

src/views/TechnologyCenter/QueryParts/Export2Excel.js

@@ -0,0 +1,220 @@
+/* eslint-disable */
+require('script-loader!file-saver');
+import XLSX from 'xlsx'
+
+function generateArray(table) {
+  var out = [];
+  var rows = table.querySelectorAll('tr');
+  var ranges = [];
+  for (var R = 0; R < rows.length; ++R) {
+    var outRow = [];
+    var row = rows[R];
+    var columns = row.querySelectorAll('td');
+    for (var C = 0; C < columns.length; ++C) {
+      var cell = columns[C];
+      var colspan = cell.getAttribute('colspan');
+      var rowspan = cell.getAttribute('rowspan');
+      var cellValue = cell.innerText;
+      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+
+      //Skip ranges
+      ranges.forEach(function (range) {
+        if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
+          for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
+        }
+      });
+
+      //Handle Row Span
+      if (rowspan || colspan) {
+        rowspan = rowspan || 1;
+        colspan = colspan || 1;
+        ranges.push({
+          s: {
+            r: R,
+            c: outRow.length
+          },
+          e: {
+            r: R + rowspan - 1,
+            c: outRow.length + colspan - 1
+          }
+        });
+      };
+
+      //Handle Value
+      outRow.push(cellValue !== "" ? cellValue : null);
+
+      //Handle Colspan
+      if (colspan)
+        for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
+    }
+    out.push(outRow);
+  }
+  return [out, ranges];
+};
+
+function datenum(v, date1904) {
+  if (date1904) v += 1462;
+  var epoch = Date.parse(v);
+  return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+}
+
+function sheet_from_array_of_arrays(data, opts) {
+  var ws = {};
+  var range = {
+    s: {
+      c: 10000000,
+      r: 10000000
+    },
+    e: {
+      c: 0,
+      r: 0
+    }
+  };
+  for (var R = 0; R != data.length; ++R) {
+    for (var C = 0; C != data[R].length; ++C) {
+      if (range.s.r > R) range.s.r = R;
+      if (range.s.c > C) range.s.c = C;
+      if (range.e.r < R) range.e.r = R;
+      if (range.e.c < C) range.e.c = C;
+      var cell = {
+        v: data[R][C]
+      };
+      if (cell.v == null) continue;
+      var cell_ref = XLSX.utils.encode_cell({
+        c: C,
+        r: R
+      });
+
+      if (typeof cell.v === 'number') cell.t = 'n';
+      else if (typeof cell.v === 'boolean') cell.t = 'b';
+      else if (cell.v instanceof Date) {
+        cell.t = 'n';
+        cell.z = XLSX.SSF._table[14];
+        cell.v = datenum(cell.v);
+      } else cell.t = 's';
+
+      ws[cell_ref] = cell;
+    }
+  }
+  if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
+  return ws;
+}
+
+function Workbook() {
+  if (!(this instanceof Workbook)) return new Workbook();
+  this.SheetNames = [];
+  this.Sheets = {};
+}
+
+function s2ab(s) {
+  var buf = new ArrayBuffer(s.length);
+  var view = new Uint8Array(buf);
+  for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  return buf;
+}
+
+export function export_table_to_excel(id) {
+  var theTable = document.getElementById(id);
+  var oo = generateArray(theTable);
+  var ranges = oo[1];
+
+  /* original data */
+  var data = oo[0];
+  var ws_name = "SheetJS";
+
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  /* add ranges to worksheet */
+  // ws['!cols'] = ['apple', 'banan'];
+  ws['!merges'] = ranges;
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: 'xlsx',
+    bookSST: false,
+    type: 'binary'
+  });
+
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), "test.xlsx")
+}
+
+export function export_json_to_excel({
+  multiHeader = [],
+  header,
+  data,
+  filename,
+  merges = [],
+  autoWidth = true,
+  bookType=  'xlsx'
+} = {}) {
+  /* original data */
+  filename = filename || 'excel-list'
+  data = [...data]
+  data.unshift(header);
+
+  for (let i = multiHeader.length-1; i > -1; i--) {
+    data.unshift(multiHeader[i])
+  }
+
+  var ws_name = "SheetJS";
+  var wb = new Workbook(),
+    ws = sheet_from_array_of_arrays(data);
+
+  if (merges.length > 0) {
+    if (!ws['!merges']) ws['!merges'] = [];
+    merges.forEach(item => {
+      ws['!merges'].push(XLSX.utils.decode_range(item))
+    })
+  }
+
+  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;
+  }
+
+  /* add worksheet to workbook */
+  wb.SheetNames.push(ws_name);
+  wb.Sheets[ws_name] = ws;
+
+  var wbout = XLSX.write(wb, {
+    bookType: bookType,
+    bookSST: false,
+    type: 'binary'
+  });
+  saveAs(new Blob([s2ab(wbout)], {
+    type: "application/octet-stream"
+  }), `${filename}.${bookType}`);
+}

src/views/TechnologyCenter/QueryParts/index.vue

@@ -29,6 +29,10 @@
       </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">
@@ -259,10 +263,19 @@
 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: '',
@@ -342,6 +355,86 @@ 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 = []

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -222,6 +222,7 @@
               <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
@@ -237,6 +238,23 @@
               <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-->
+          <!--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>-->
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -317,11 +335,19 @@
 </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() {
@@ -429,9 +455,22 @@ 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('增加成功')
+              this.dialogVisible1 = false
+              this.searchTable1()
+            } else {
+              this.$message.error('增加失败')
+            }
+          })
+        } else {
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -449,7 +488,10 @@ export default {
             } else { this.$message.error('编辑失败') }
           })
         } else {
+<<<<<<< HEAD
           console.log('error submit!!')
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           return false
         }
       })
@@ -492,6 +534,7 @@ export default {
       })
     },
     async searchPic(row, i) {
+<<<<<<< HEAD
       const { data } = await request({
         url: '',
         method: 'post',
@@ -502,6 +545,8 @@ export default {
       })
       this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
       console.log(this.tableData1[i].scanSrc)
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
     },
     warningExceed() {
       this.$message.error('仅可上传一张发票')
@@ -567,7 +612,10 @@ 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
       })
     },

src/views/dashboard/index.vue

@@ -3,7 +3,11 @@
     <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">
@@ -12,10 +16,17 @@
             </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>
@@ -149,7 +160,10 @@ export default {
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
+<<<<<<< HEAD
 
+=======
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
   /*.text {*/
     /*font-size: 14px;*/
   /*}*/

src/views/layout/components/AppMain.vue

@@ -26,6 +26,10 @@ 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>

src/views/layout/components/Navbar.vue

@@ -1,5 +1,9 @@
 <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">

src/views/layout/components/Sidebar/index.vue

@@ -7,7 +7,11 @@
         :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)"
@@ -57,8 +61,13 @@ 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>

src/views/layout/components/TagsView.vue

@@ -1,6 +1,10 @@
 <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)"/>
@@ -134,9 +138,15 @@ 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;
@@ -145,7 +155,11 @@ export default {
           margin-left: 15px;
         }
         &.active {
+<<<<<<< HEAD
           background-color: rgb(52,119,190);
+=======
+          background-color: #3d3780;
+>>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
           color: #ffffff;
           border-color: #ffffff;
           &::before {