Merge branch 'newprotect' of http://gitlab.91isoft.com:90/yangshuo/template_vue into newprotect

src/styles/index.scss

@@ -12,8 +12,10 @@ body {
   -webkit-font-smoothing: antialiased;
   text-rendering: optimizeLegibility;
   font-family:  Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Arial, sans-serif;
+
 }
 
+
 label {
   font-weight: 700;
 }

src/views/equipment/application.vue

@@ -31,47 +31,52 @@
     <div class="placeholder" />
     <div style="padding:5px 10px">
       <div class="mb12 font-small-bold">设备申请列表</div>
-      <el-table v-loading="loading" border :data="roleList" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" border :data="tableData" @selection-change="handleSelectionChange">
+
         <el-table-column type="index" label="序号" width="50" />
 
-        <el-table-column label="名称" prop="roleName" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            {{ scope.row.roleName || '-' }}
-          </template>
-        </el-table-column>
+              <el-table-column
+            label="设备名称"
+            prop="name">
+          </el-table-column>
+          <el-table-column
+            label="设备编码"
+            prop="id">
+          </el-table-column>
+          <el-table-column
+            label="LOT"
+            prop="lot">
+          </el-table-column>
 
-        <el-table-column label="编码" prop="roleKey">
-          <template slot-scope="scope">
-            {{ scope.row.roleKey || '-' }}
-          </template>
-        </el-table-column>
+          <el-table-column type="expand" width="30">
+            <template slot-scope="props">
+              <el-form label-position="left" inline class="demo-table-expand">
+                <el-form-item label="设备名称：">
+                  <span>{{ props.row.name }}</span>
+                </el-form-item>
+                <el-form-item label="设备编码：">
+                  <span>{{ props.row.id }}</span>
+                </el-form-item>
+                <el-form-item label="LOT：">
+                  <span>{{ props.row.lot }}</span>
+                </el-form-item>
+                <el-form-item label="厚度：">
+                  <span>{{ props.row.ply }}</span>
+                </el-form-item>
+                <el-form-item label="创建时间：">
+                  <span>{{ props.row.creatTime }}</span>
+                </el-form-item>
+                <el-form-item label="位置：">
+                  <span>{{ props.row.loction }}</span>
+                </el-form-item>
+                <el-form-item label="创建人：">
+                  <span>{{ props.row.creatMan }}</span>
+                </el-form-item>
+              </el-form>
+            </template>
+          </el-table-column>
 
-        <el-table-column label="LOT" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
 
-        </el-table-column>
-        <!-- <el-table-column label="位置" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="厚度" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
-          <template slot-scope="scope">
-            <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建人" prop="roleSort">
-          <template slot-scope="scope">
-            {{ scope.row.roleSort || '-' }}
-          </template>
-        </el-table-column> -->
         <el-table-column label="操作" class-name="small-padding fixed-width" width="140px">
           <template slot-scope="scope">
             <!--            <el-button-->
@@ -278,7 +283,24 @@ export default {
           { required: true, message: '请输入设备排序', trigger: 'blur' }
         ]
       },
-      deptOptions: []
+      deptOptions: [],
+      tableData: [{
+          name: 'XXXXXXX',
+          id: 'XXXXXXX',
+          lot: 'XXXXXXXXX',
+          loction: 'XXXXXXX',
+          ply: 'XXXXXXX',
+          creatTime: 'XXXXXXX',
+          creatMan: 'XXXXXXX'
+        }, {
+          name: 'XXXXXXX',
+          id: 'XXXXXXX',
+          lot: 'XXXXXXXXX',
+          loction: 'XXXXXXX',
+          ply: 'XXXXXXX',
+          creatTime: 'XXXXXXX',
+          creatMan: 'XXXXXXX'
+        }]
     }
   },
   /** 路由离开前存储筛选条件*/
@@ -654,4 +676,16 @@ export default {
   height: 12em;
   width: 4px;
 }
+.demo-table-expand {
+    font-size: 0;
+  }
+  .demo-table-expand label {
+    width: 90px;
+    color: #99a9bf;
+  }
+  .demo-table-expand .el-form-item {
+    margin-right: 0;
+    margin-bottom: 0;
+    width: 50%;
+  }
 </style>

src/views/processManagement/basicProcessManagement/index.vue

@@ -265,7 +265,14 @@ export default {
     // 表单重置
     reset() {
       // TODO: 将模拟数据的空对象赋值给表单对象，达成清空填写表单的效果
-      this.form = this.formReset
+      this.form = {
+        processName: '',
+        workshop: '',
+        flag: '1',
+        createTime: new Date(),
+        updataTime: new Date(),
+        createBy: ''
+      }
     },
     /** TODO: 查询按钮操作 */
     handleQuery() {
@@ -279,7 +286,7 @@ export default {
     /** TODO: 新增按钮操作 */
     handleAdd() {
       // TODO: 初始化新增对话框的状态
-      this.form = this.formReset
+      this.reset()
       this.title = '添加工序'
       this.open = !this.open
     },