9/22(first)

src/views/production/gxlog/index.vue

@@ -140,6 +140,15 @@
             {{ scope.row.jblot || '-' }}
           </template>
         </el-table-column>
+        <el-table-column
+          label="解锁人"
+          prop="unlockUsername"
+          :show-overflow-tooltip="true"
+        >
+          <template slot-scope="scope">
+            {{ scope.row.unlockUsername || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column
           label="操作人"
           prop="createName"
@@ -299,6 +308,14 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="12">
+            <el-form-item label="解锁人：" prop="unlockUsername">
+              <el-input
+                v-model.trim="singleDetails.unlockUsername"
+                :readonly="true"
+              />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="操作人：" prop="createName">
               <el-input
@@ -370,6 +387,7 @@ export default {
         pissb: '',
         pstatus: '',
         pnumber: '',
+        unlockUsername : '',
         createName: '',
         createTime: ''
       },