借领管理快速添加人员、调岗bug修复等

src/views/warehouse/borrow/apply/form.vue

@@ -69,6 +69,13 @@
                 </el-select>
                 <!-- <el-input v-model="form.policeNote" style="width: 240px;"
                   placeholder="请填写借用人名称"/> -->
+                 <el-popover
+                  placement="top-start"
+                  width="190"
+                  trigger="hover"
+                  content="没有警员？点击去添加">
+                  <el-button class="el-icon-circle-plus-outline" slot="reference" @click="addPoliceForm"></el-button>
+                </el-popover>
               </el-form-item>
             </el-collapse-item>
             <el-collapse-item name="2">
@@ -310,6 +317,8 @@
         >确认</el-button
       >
     </div>
+    <!-- 表单组件-引用新增警员页面 -->
+     <eForm ref="form" :is-add="isAdd" @ok="handeleInit"/>
   </el-dialog>
 </template>
 
@@ -321,6 +330,7 @@ import { getProcess, getAllProcess } from "@/api/process";
 import { getPagePoliceman } from "@/api/policeman";
 import { deleteTxt, addTxt, getListTxt } from "@/api/policeman";
 import cnchar from "cnchar";
+import eForm from '@/views/base/person/form'
 export default {
   props: {
     isAdd: {
@@ -328,6 +338,7 @@ export default {
       required: true,
     },
   },
+  components: { eForm },
   data() {
     return {
       loading: false,
@@ -626,6 +637,18 @@ export default {
         }
       });
     },
+    //添加警员
+     addPoliceForm() {
+      this.isAdd = true
+      const _this = this.$refs.form
+      _this.initOrg()
+      _this.initCabinets(this.$store.state.user.user.baseJpOrganization.id)
+      _this.dialog = true
+     console.log('添加警员')
+    },
+    handeleInit() {
+      this.getPolicemans()
+    },
     //获取装备库存
     getAllInventoryList() {
       this.equipmentList = [];

src/views/warehouse/changePost/main/common.vue

@@ -163,9 +163,10 @@ export default {
       const _this = this.$refs.applyForm
       _this.form = data
       _this.form.orgCode = this.$store.state.user.user.baseJpOrganization.code.substring(0,6)
-      _this.detailList = data.detailList
+      // _this.detailList = data.detailList
       _this.initOrgTree()
       _this.initPolicemanList()
+      _this.changePoliceman(data.policeId)
       _this.getProcess(data.nextStepId)
       _this.dialog = true
     },

src/views/warehouse/inAndOut/index.vue

@@ -32,12 +32,16 @@
             <el-tab-pane label="报废" name="7">
               <warehouse-log :orgList="orgList" :warehouseList="warehouseList" :actionState="selectedOrder" @changeOrg="changeOrg"/>
             </el-tab-pane>
-            <el-tab-pane label="盘亏" name="23">
+            <el-tab-pane label="销毁" name='25' v-if="orgCode === '330200000000'">
               <warehouse-log :orgList="orgList" :warehouseList="warehouseList" :actionState="selectedOrder" @changeOrg="changeOrg"/>
             </el-tab-pane>
-            <el-tab-pane label="销毁" name='25' v-if="orgCode === '330200000000'">
+             <el-tab-pane label="盘库（赢）" name="22">
+              <warehouse-log :orgList="orgList" :warehouseList="warehouseList" :actionState="selectedOrder" @changeOrg="changeOrg"/>
+            </el-tab-pane>
+            <el-tab-pane label="盘库（亏）" name="23">
               <warehouse-log :orgList="orgList" :warehouseList="warehouseList" :actionState="selectedOrder" @changeOrg="changeOrg"/>
             </el-tab-pane>
+            
             <!-- <el-tab-pane label="跨库借用" name="15">
               <warehouse-log :orgList="orgList" :warehouseList="warehouseList" :actionState="selectedOrder" @changeOrg="changeOrg"/>
             </el-tab-pane>

src/views/warehouse/inAndOut/warehouseDetail.vue

@@ -27,7 +27,8 @@
             <el-tag v-else-if="scope.row.actionState === 19" type="success">装备回库</el-tag>
             <el-tag v-else-if="scope.row.actionState == 24" type="success">调岗出库</el-tag>
             <el-tag v-else-if="scope.row.actionState == 25" type="danger">销毁</el-tag>
-            <el-tag v-else-if="scope.row.actionState == 23" type="warning">盘亏</el-tag>
+            <el-tag v-else-if="scope.row.actionState == 22" type="warning">盘库（赢）</el-tag>
+            <el-tag v-else-if="scope.row.actionState == 23" type="warning">盘库（亏）</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="安全等级" align="center" width="150px" prop="safeLevel">

src/views/warehouse/inAndOut/warehouseLog.vue

@@ -81,7 +81,8 @@
             <el-tag v-else-if="scope.row.actionState === 19" type="success">装备回库</el-tag>
             <el-tag v-else-if="scope.row.actionState == 24" type="success">调岗出库</el-tag>
             <el-tag v-else-if="scope.row.actionState == 25" type="danger">销毁</el-tag>
-            <el-tag v-else-if="scope.row.actionState == 23" type="warning">盘亏</el-tag>
+            <el-tag v-else-if="scope.row.actionState == 22" type="danger">盘库（赢）</el-tag>
+            <el-tag v-else-if="scope.row.actionState == 23" type="danger">盘库（亏）</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="安全等级" align="center" width="150px" prop="safeLevel">

src/views/warehouse/maintenance/form.vue

@@ -97,6 +97,7 @@
               <span v-else-if="scope.row.actionState == 15 || scope.row.actionState == 16">跨仓库借用</span>  
               <span v-else-if="scope.row.actionState == 17 || scope.row.actionState == 18">跨仓库归还</span>
               <span v-else-if="scope.row.actionState == 19">装备回库</span>
+              <span v-else-if="scope.row.actionState == 22">盘赢</span>
               <span v-else-if="scope.row.actionState == 23">盘亏</span>
               {{scope.row.outInState == 0 ? '出库': '入库'}}
             </template>
@@ -125,7 +126,8 @@
               <span v-else-if="scope.row.actionState == 15 || scope.row.actionState == 16">跨仓库借用</span>  
               <span v-else-if="scope.row.actionState == 17 || scope.row.actionState == 18">跨仓库归还</span>
               <span v-else-if="scope.row.actionState == 19">装备回库</span>
-              <span v-else-if="scope.row.actionState == 23">盘亏</span>
+              <span v-else-if="scope.row.actionState == 22">盘库（赢）</span>
+              <span v-else-if="scope.row.actionState == 23">盘库（亏）</span>
               {{scope.row.outInState == 0 ? '出库': '入库'}}
             </template>
           </el-table-column>

src/views/warehouse/receive/apply/form.vue

@@ -12,21 +12,31 @@
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-select v-model="form.policeId" style="width: 240px;" filterable placeholder="请选择领用人">
+                <el-select v-model="form.policeId" style="width: 240px;" filterable placeholder="请选择领用人" >
                   <el-option
                     v-for="item in policeList"
                     :key="item.name"
                     :label="item.name"
-                    :value="item.id">
+                    :value="item.id"
+                    >
                   </el-option>
+                 <!-- <hr style="border-top:1px dashed #e8e8e8;"> 
+                  <el-button type="info" style="font-size: 14px;width: 220px;" @click="addPoliceForm">+ 添加警员</el-button> -->
                 </el-select>
+                <el-popover
+                  placement="top-start"
+                  width="190"
+                  trigger="hover"
+                  content="没有警员？点击去添加">
+                  <el-button class="el-icon-circle-plus-outline" slot="reference" @click="addPoliceForm"></el-button>
+                </el-popover>
               </el-form-item>
               <div style="float: right; margin-top: -100px;margin-right: 140px;">
               <el-form-item>
                 <!-- `checked` 为 true 或 false -->
                 <el-checkbox v-model="form.isBindCabinet"  >放入单警柜</el-checkbox>
               </el-form-item>
-               <el-form-item   label="附件" label-width="85px">
+               <el-form-item   label="附件" label-width="80px">
                 <el-upload style="width: 240px; "
                   class="upload-demo"
                   name="borrowFile"
@@ -39,7 +49,7 @@
                   :limit="1"
                   :on-exceed="handleExceed"
                   :file-list="form.files">
-                <el-button size="small" type="primary">点击上传</el-button>
+                <el-button size="small" type="primary">点击上传<i class="el-icon-upload el-icon--right"></i></el-button>
                 </el-upload>
               </el-form-item>
               </div>
@@ -168,6 +178,8 @@
       <el-button  @click="cancel" type="info" plain>关闭</el-button>
       <el-button :loading="loading" type="primary" @click="doSubmit" v-if="!form.flowState">确认</el-button>
     </div>
+    <!-- 表单组件-引用新增警员页面 -->
+     <eForm ref="form" :is-add="isAdd" @ok="handeleInit"/>
   </el-dialog>
 </template>
 
@@ -178,6 +190,7 @@ import { addAndApprovalBorrowOrder } from '@/api/borrow'
 import { getAllInventoryList } from '@/api/inventory'
 import { deleteTxt, addTxt, getListTxt, getPagePoliceman } from '@/api/policeman'
 import cnchar from "cnchar";
+import eForm from '@/views/base/person/form'
 export default {
   props: {
     isAdd: {
@@ -185,6 +198,7 @@ export default {
       required: true
     }
   },
+  components: { eForm },
   computed: {
     ...mapGetters([
       'baseApi2'
@@ -266,6 +280,7 @@ export default {
           }
       }
     },
+    //获取警员列表
     getPolicemans() {
       getPagePoliceman({page:0,size:999,orgizationCode:this.$store.state.user.user.baseJpOrganization.id,level:'本级'}).then(res => {
         if(res.code == '10000') {
@@ -298,6 +313,7 @@ export default {
         }
       })
     },
+    //选择警员
     doThing() {
       if (!this.form.policeId) {
         this.$message.warning('请选择领用的警员')
@@ -327,6 +343,18 @@ export default {
         console.log(err.response.data.message)
       })
     },
+    //添加警员
+     addPoliceForm() {
+      this.isAdd = true
+      const _this = this.$refs.form
+      _this.initOrg()
+      _this.initCabinets(this.$store.state.user.user.baseJpOrganization.id)
+      _this.dialog = true
+     console.log('添加警员')
+    },
+    handeleInit() {
+      this.getPolicemans()
+    },
     resetForm() {
       this.dialog = false
       this.form = {