Merge remote-tracking branch 'origin/project1' into project1

src/views/equipment/draw.vue

@@ -161,7 +161,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="pissb：" prop="pissb">
-              <el-input v-model.trim="singleDetails.pissb" :readonly="true" />
+              {{ selectedPissb(singleDetails.pissb) }}
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -174,6 +174,14 @@
           </el-col>
         </el-row>
 
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="pnumber：" prop="pnumber">
+              <el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-row>
           <el-col :span="8">
             <el-form-item label="申请人：" prop="createName">
@@ -185,11 +193,6 @@
               <el-input v-model.trim="singleDetails.createDate" :readonly="true" />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="pnumber：" prop="pnumber">
-              <el-input v-model.trim="singleDetails.pnumber" :readonly="true" />
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
 
@@ -821,6 +824,18 @@ export default {
           }
         })
       })
+    },
+
+    /* TODO: pissb 类型判断的公用方法 */
+    selectedPissb(pissb) {
+      switch (pissb) {
+        case '0':
+          return '否'
+        case '1':
+          return '是'
+        default:
+          return ''
+      }
     }
   }
 }