基础信息和两个设备申请

src/views/equipment/basicInfo.vue

@@ -86,9 +86,9 @@
             {{ scope.row.prank || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">

src/views/equipment/draw.vue

@@ -12,9 +12,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="phd" prop="phd">
+      <el-form-item label="phd" prop="phdStr">
         <el-input
-          v-model="queryParams.phd"
+          v-model="queryParams.phdStr"
           placeholder="请输入phd"
           clearable
           size="small"
@@ -22,9 +22,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="prank" prop="prank">
+      <el-form-item label="prank" prop="prankStr">
         <el-input
-          v-model="queryParams.prank"
+          v-model="queryParams.prankStr"
           placeholder="请输入prank"
           clearable
           size="small"
@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"

src/views/processManagement/draw.vue

@@ -67,25 +67,15 @@
             {{ scope.row.pissb || '-' }}
           </template>
         </el-table-column>
-        <el-table-column label="pstatus" prop="pstatus">
-          <template slot-scope="scope">
-            {{ scope.row.pstatus || '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="ptype" prop="ptype">
-          <template slot-scope="scope">
-            {{ scope.row.ptype || '-' }}
-          </template>
-        </el-table-column>
         <el-table-column label="状态" prop="pstatus">
           <template slot-scope="scope">
             <span v-if="scope.row.pstatus === '0'" style="color: red">未完成</span>
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作员" prop="createBy">
+        <el-table-column label="操作员" prop="createName">
           <template slot-scope="scope">
-            {{ scope.row.createBy || '-' }}
+            {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
         <el-table-column label="操作时间" :show-overflow-tooltip="true" align="center" prop="createTime" width="200px">
@@ -100,7 +90,7 @@
               type="text"
               style="color: #49cec9"
               @click="handleUpdate(scope.row)"
-            >修改</el-button>
+            >处理</el-button>
             <el-button
               size="mini"
               type="text"