Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

src/api/ManufacturingCenter/MachiningSequenceAdjustment.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 // 初始化 项目名称
-export function getEntryNameValue() {
+export function searchtable() {
   return request({
     url: '',
     method: 'post',

src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue

@@ -0,0 +1,122 @@
+<template>
+  <div class="app-container">
+
+    <el-card>
+      <el-button type="success" class="el-icon-search" size="small">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table v-loading="loading0" :data="tableData" height="650" style="width: 100%;" border>
+        <el-table-column
+          label=" "
+          align="center"
+          type="index"
+          width="50"/>
+        <el-table-column label="外协厂家名称" align="center" width="280px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="外协厂家简称" align="center" width="110px">
+          <template slot-scope="scope">
+            {{ scope.row.外协厂家简称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="地址" align="center" width="280px">
+          <template slot-scope="scope">
+            {{ scope.row.地址 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="联系人" align="center" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.联系人 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="电话" align="center" width="140px">
+          <template slot-scope="scope">
+            {{ scope.row.电话 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="传真" align="center" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.传真 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="设备情况" align="center" width="230px">
+          <template slot-scope="scope">
+            {{ scope.row.设备情况 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.备注 }}
+          </template>
+        </el-table-column>
+        <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="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>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading0"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+
+  </div>
+</template>
+
+<script>
+import {} from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+export default {
+  data() {
+    return {
+      loading0: false,
+      tableData: [], // 表格数据
+      pageSize: 10,
+      pageCurrent: 1,
+      total: 0
+    }
+  },
+  created() {
+  },
+  methods: {
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-input{
+    width: 210px;
+  }
+</style>

src/views/MarketingCenter/BidBond/index.vue

@@ -408,7 +408,7 @@
 
 <script>
 import elInput from 'element-ui/packages/input'
-import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, ComplianceGold, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
+import { initType, selectBidBond, getTree, tree, getTablePeople, TakeBack, addBidBond, editBidBond, delBidBond, winningBid, executionProgressID, intProject, submitPerformanceBond } from '@/api/MarketingCenter/BidBond'
 export default {
   components: {
     elInput