盘点

src/views/equipment/boundinout.vue

@@ -84,7 +84,7 @@
     <div class="placeholder" />
     <div style="padding:10px">
       <div class="mb12 font-small-bold">设备受入列表</div>
-      <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange">
+      <!-- <el-table v-loading="loading" border :data="list" @selection-change="handleSelectionChange"> -->
         <!--        <el-table-column type="selection" width="55" align="center" />-->
         <!--        &lt;!&ndash;      <el-table-column type="index" label="序号" width="50" />&ndash;&gt;-->
         <!--        <el-table-column label="访问编号" width="100" align="center" prop="infoId" show-overflow-tooltip>-->
@@ -120,15 +120,15 @@
         <!--        &lt;!&ndash;          </template>&ndash;&gt;-->
         <!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
         <!--        <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
-        <el-table-column type="index" width="55" label="序号" align="center" />
-        <!--        <el-table-column label="访问编号" align="center" prop="businessId" />-->
-        <el-table-column label="设备名称" align="center" prop="username" />
+        <!-- <el-table-column type="index" width="55" label="序号" align="center" />
+               <el-table-column label="访问编号" align="center" prop="businessId" />-->
+        <!-- <el-table-column label="设备名称" align="center" prop="username" />
         <el-table-column label="XXXX" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
-        <el-table-column label="XXXX" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
+        <el-table-column label="XXXX" align="center" prop="loginLocation" :show-overflow-tooltip="true" /> -->
         <!-- <el-table-column label="浏览器" align="center" prop="browser" />
            <el-table-column label="操作系统" align="center" prop="os" />-->
         <!--        <el-table-column label="登录状态" align="center" prop="status" :formatter="statusFormat" />-->
-        <el-table-column label="XXXX" align="center" prop="status">
+        <!-- <el-table-column label="XXXX" align="center" prop="status">
           <template slot-scope="scope">
             <span v-if="scope.row.status === '0'">失败</span>
             <span v-if="scope.row.status === '1'">成功</span>
@@ -146,14 +146,54 @@
         </el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">
-            <!--            <coolbutton :type="textPrimary" :name="deleteName" :size="deleteSize" @btn-click="handleDelete(scope.row.businessId)" />-->
+                       <coolbutton :type="textPrimary" :name="deleteName" :size="deleteSize" @btn-click="handleDelete(scope.row.businessId)" />
             <el-button
               type="text"
               size="small"
               @click="handleDelete(scope.row.businessId)"
             >删除</el-button>
           </template>
+        </el-table-column> -->
+      <!-- </el-table> -->
+      <el-table v-loading="loading" border :data="processList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" />
+        <el-table-column type="index" label="序号" width="80" />
+        <el-table-column label="工序名称" prop="processCode" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ scope.row.processCode || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="编码" prop="lot">
+          <template slot-scope="scope">
+            {{ scope.row.lot || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="位置" prop="location">
+          <template slot-scope="scope">
+            {{ scope.row.location || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="位置" prop="location">
+          <template slot-scope="scope">
+            {{ scope.row.location || '-' }}
+          </template>
         </el-table-column>
+        <el-table-column label="厚度" prop="thickness">
+          <template slot-scope="scope">
+            {{ scope.row.thickness || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建人" prop="createBy">
+          <template slot-scope="scope">
+            {{ scope.row.createBy || '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" :show-overflow-tooltip="true" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ scope.row.createTime | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
+          </template>
+        </el-table-column>
+
       </el-table>
     </div>
     <pagination
@@ -228,6 +268,7 @@ export default {
   components: { Template, Coolbutton },
   data() {
     return {
+      processList: [{ processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '002', lot: 'xxx', location: '位置02', thickness: '70', createBy: '操作员02', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }, { processCode: '001', lot: 'xxx', location: '位置01', thickness: '50', createBy: '操作员01', createTime: new Date() }],
       endDatePicker: this.handelFixDate(),
       // 自定义按钮
       deletetypePrimary: 'danger',