样式

2019-09-18 12:24:50 +08:00
parent 93eb6ec5c5
commit faab73c1fa
58 changed files with 0 additions and 4278 deletions
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -4,24 +4,14 @@
      <el-col :span="6">
        <el-card>
          <span>工艺分类：</span>
-<<<<<<< HEAD
          <el-button type="primary" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
          <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" @click="editProcessClassification()">编辑</el-button>
          <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
-=======
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
-          <el-button size="small" type="warning" icon="el-icon-edit" @click="editProcessClassification()">编辑</el-button>
-          <el-button size="small" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        </el-card>
      </el-col>
      <el-col :span="18">
        <el-card>
-<<<<<<< HEAD
          <el-button type="primary" plain style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
-=======
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addProcess">新增工艺名称</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
        </el-card>
      </el-col>
    </el-row>
@@ -32,7 +22,6 @@
            v-loading="loading1"
            ref="multipleTable"
            :data="tableData1"
-<<<<<<< HEAD
            size="mini"
            highlight-current-row
            stripe
@@ -40,12 +29,6 @@
            tooltip-effect="dark"
            style="width: 100%"
            height="800">
-=======
-            stripe
-            tooltip-effect="dark"
-            style="width: 100%"
-            height="700">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
            <el-table-column align="center" label=" " width="50px">
              <template slot-scope="scope">
                <el-radio :label="scope.row.工艺分类流水号" v-model="radio" @change.native="getCurrentRow(scope.row.工艺分类流水号, scope.row.工艺分类名称)">
@@ -67,7 +50,6 @@
          <el-table
            :data="tableData2"
            :row-key="getRowKeys"
-<<<<<<< HEAD
            :row-style="abc"
            :expand-row-keys="expands"
            size="mini"
@@ -81,21 +63,10 @@
              <template slot-scope="scope">
                <el-table :data="tableData3" border stripe style="width: 40%">
                  <el-table-column label="工艺要求" align="center">
-=======
-            :expand-row-keys="expands"
-            height="700"
-            width="100%"
-            @expand-change="searchTechnologicalRequirementsOfProcessNum">
-            <el-table-column type="expand">
-              <template slot-scope="scope">
-                <el-table :data="tableData3" border>
-                  <el-table-column label="工艺要求">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                    <template slot-scope="scope">
                      {{ scope.row.工艺要求 }}
                    </template>
                  </el-table-column>
-<<<<<<< HEAD
                  <el-table-column label="操作" align="center" >
                    <template slot-scope="scope">
                      <el-tooltip effect="dark" content="编辑" placement="top">
@@ -117,66 +88,34 @@
                            @click="delTechnologicalRequirements(scope.row)"/>
                        </div>
                      </el-tooltip>
-=======
-                  <el-table-column label="操作" fixed="right" width="200px">
-                    <template slot-scope="scope">
-                      <el-button
-                        size="mini"
-                        type="warning"
-                        icon="el-icon-edit"
-                        @click="editTechnologicalRequirements(scope.row)">编辑</el-button>
-                      <el-button
-                        size="mini"
-                        type="danger"
-                        icon="el-icon-delete"
-                        @click="delTechnologicalRequirements(scope.row)">删除</el-button>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                    </template>
                  </el-table-column>
                </el-table>
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column label="工艺名称" width="200">
-=======
-            <el-table-column label="工艺名称">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                {{ scope.row.工艺名称 }}
              </template>
            </el-table-column>
-<<<<<<< HEAD
            <el-table-column align="center" label="操作" >
-=======
-            <el-table-column>
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
              <template slot-scope="scope">
                <el-button
                  size="mini"
                  type="warning"
-<<<<<<< HEAD
                  icon="el-icon-edit-outline"
                  plain
-=======
-                  icon="el-icon-edit"
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                  @click="editProcess(scope.row)">编辑工艺</el-button>
                <el-button
                  size="mini"
                  type="danger"
-<<<<<<< HEAD
                  plain
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                  icon="el-icon-delete"
                  @click="delProcess(scope.row)">删除工艺</el-button>
                <el-button
                  size="mini"
                  type="primary"
-<<<<<<< HEAD
                  plain
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
                  icon="el-icon-circle-plus-outline"
                  @click="addTechnologicalRequirements(scope.row)">新增要求</el-button>
              </template>
@@ -185,11 +124,7 @@
        </el-card>
      </el-col>
    </el-row>
-<<<<<<< HEAD
    <el-dialog :visible.sync="dialogFormVisible1" title="新增工艺分类" center style="min-height: 300px" width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible1" title="增加工艺分类" center style="min-height: 300px" width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" >
        <el-form-item label="工艺分类" prop="ProcessClassification">
          <el-input v-model="form1.ProcessClassification" size="small" clearable style="width:200px"/>
@@ -213,11 +148,7 @@
      </div>
    </el-dialog>

-<<<<<<< HEAD
    <el-dialog :visible.sync="dialogFormVisible3" title="新增工艺" center style="min-height: 300px" width="400px">
-=======
-    <el-dialog :visible.sync="dialogFormVisible3" title="增加工艺" center style="min-height: 300px" width="400px">
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
      <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" >
        <el-form-item label="工艺名称" prop="Process">
          <el-input v-model="form2.Process" size="small" clearable style="width:200px"/>
@@ -328,14 +259,11 @@ export default {
    this.searchProcessClassification()
  },
  methods: {
-<<<<<<< HEAD
    abc() {
      return {
        height: '35px'
      }
    },
-=======
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d
    searchProcessClassification() {
      this.loading1 = true
      searchProcessClassification().then(response => {
@@ -656,16 +584,9 @@ export default {
 </script>

 <style scoped>
-<<<<<<< HEAD
  /*.el-card {*/
  /*  margin-top: 15px;*/
  /*  margin-left: 15px;*/
 /* }!**!*/
-=======
-  .el-card {
-    margin-top: 15px;
-    margin-left: 15px;
-  }
->>>>>>> 4a39ba8190d04cdcdea962794e7d7df3408bfd2d

 </style>