修改条码生产

src/views/equipment/draw.vue

@@ -95,6 +95,16 @@
             {{ scope.row.createName || '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="解锁人" prop="pnumber">
+        <template slot-scope="scope">
+          {{ scope.row.unlockUsername|| '-' }}
+        </template>
+      </el-table-column>
+        <el-table-column label="解锁时间" prop="pnumber">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.unlockDate, '{y}-{m}-{d}  {h}:{i}') || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请时间" :show-overflow-tooltip="true" align="center" prop="updateDate" width="200px">
           <template slot-scope="scope">
             <span>{{ scope.row.updateDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>
@@ -170,6 +180,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="解锁人：" prop="unlockUsername">
+              <el-input v-model.trim="singleDetails.unlockUsername" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="解锁时间：" prop="unlockDate">
+              <el-input v-model.trim="singleDetails.unlockDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
         <el-row>
           <el-col :span="8">
@@ -485,6 +507,7 @@ export default {
     this.getCodeDict()
   },
   methods: {
+    parseTime,
     // 判断是否跟列表中的第一个是否相同
     isSameMonths(dateArray, data) {
       for (let i = 0; i < dateArray.length; i++) {

src/views/processManagement/draw.vue

@@ -90,6 +90,16 @@
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
+        <el-table-column label="解锁人" prop="pnumber">
+          <template slot-scope="scope">
+            {{ scope.row.unlockUsername|| '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="解锁时间" prop="pnumber" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.unlockDate, '{y}-{m}-{d}  {h}:{i}') || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请人" prop="createName">
           <template slot-scope="scope">
             {{ scope.row.createName || '-' }}
@@ -170,6 +180,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="解锁人：" prop="unlockUsername">
+              <el-input v-model.trim="singleDetails.unlockUsername" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="解锁时间：" prop="unlockDate">
+              <el-input v-model.trim="singleDetails.unlockDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="申请人：" prop="createName">

src/views/processManagement/inventoryQuery/index.vue

@@ -95,6 +95,16 @@
             <span v-else style="color: green">已完成</span>
           </template>
         </el-table-column>
+        <el-table-column label="解锁人" prop="unlockUsername">
+          <template slot-scope="scope">
+            {{ scope.row.unlockUsername|| '-' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="解锁时间" prop="unlockDate" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            {{ parseTime(scope.row.unlockDate, '{y}-{m}-{d}  {h}:{i}') || '-' }}
+          </template>
+        </el-table-column>
         <el-table-column label="申请人" prop="createName">
           <template slot-scope="scope">
             {{ scope.row.createName || '-' }}
@@ -168,6 +178,18 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="解锁人：" prop="unlockUsername">
+              <el-input v-model.trim="singleDetails.unlockUsername" :readonly="true" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="解锁时间：" prop="unlockDate">
+              <el-input v-model.trim="singleDetails.unlockDate" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="8">
             <el-form-item label="申请人：" prop="createName">