shaogen1995 4 лет назад
Родитель
Сommit
280f1a56f1
2 измененных файлов с 61 добавлено и 14 удалено
  1. 9 7
      src/views/holding/holding2.vue
  2. 52 7
      src/views/holding/holding3_look.vue

+ 9 - 7
src/views/holding/holding2.vue

@@ -44,19 +44,21 @@
               border
               border
               style="width: 100%"
               style="width: 100%"
             >
             >
-              <el-table-column prop="num" label="出库单号" :resizable="false">
+              <el-table-column prop="num" label="出库单号" width="200" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="realName" label="登记人" width="200" :resizable="false">
+              <el-table-column prop="realName" label="登记人" width="100" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="type" label="出库类型" width="200" :resizable="false">
+              <el-table-column prop="type" label="出库类型" width="80" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="createTime" label="登记日期" width="280" :resizable="false">
+              <el-table-column prop="description" label="出库说明" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="updateTime" label="出库日期" width="280" :resizable="false">
+              <el-table-column prop="createTime" label="登记日期" width="180" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column prop="status" label="状态" width="200" :resizable="false">
+              <el-table-column prop="updateTime" label="出库日期" width="180" :resizable="false">
               </el-table-column>
               </el-table-column>
-              <el-table-column label="操作" width="200" :resizable="false">
+              <el-table-column prop="status" label="状态" width="100" :resizable="false">
+              </el-table-column>
+              <el-table-column label="操作" width="140" :resizable="false">
                 <template #default='{row}'>
                 <template #default='{row}'>
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待归还'||row.status==='已归还'||row.status==='审核不通过'" @click="myLook(row)">查看</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>
                   <el-button type="text" v-if="row.status==='待审核'" @click="audit(row)" v-show="userLogo.audit">审核</el-button>

+ 52 - 7
src/views/holding/holding3_look.vue

@@ -24,7 +24,7 @@
           </div>
           </div>
           <div v-else style="background-color: #85ce61">已出库</div>
           <div v-else style="background-color: #85ce61">已出库</div>
         </div>
         </div>
-        <div class="info" style="max-height:100vh">
+        <div class="info" style="max-height: 100vh">
           <div class="row">
           <div class="row">
             <div>
             <div>
               <span>藏品名称:</span>{{ myObj.name ? myObj.name : "-" }}
               <span>藏品名称:</span>{{ myObj.name ? myObj.name : "-" }}
@@ -129,7 +129,7 @@
           <div class="row">
           <div class="row">
             <div>
             <div>
               <span style="width: 80px">来源说明:</span>
               <span style="width: 80px">来源说明:</span>
-              <p style="flex: 1;text-align: left;">
+              <p style="flex: 1; text-align: left">
                 {{ myObj.description ? myObj.description : "-" }}
                 {{ myObj.description ? myObj.description : "-" }}
               </p>
               </p>
             </div>
             </div>
@@ -155,6 +155,16 @@
       </div>
       </div>
       <div class="conten">
       <div class="conten">
         <div class="daochu">
         <div class="daochu">
+          <el-button
+            type="primary"
+            size="small"
+            @click="begEdit"
+            v-if="userLogo"
+            >申请编辑</el-button
+          >
+          <el-button type="primary" size="small" @click="moveDialog = true" v-if="myObj.storageId"
+            >申请移库</el-button
+          >
           <el-button size="small" @click="record">操作记录</el-button>
           <el-button size="small" @click="record">操作记录</el-button>
           <el-button size="small" @click="exPdf">导 出</el-button>
           <el-button size="small" @click="exPdf">导 出</el-button>
         </div>
         </div>
@@ -289,7 +299,7 @@
               </div>
               </div>
             </div>
             </div>
             <div class="row">
             <div class="row">
-              <div>
+              <div style="height:39px">
                 <span>入库位置:</span>
                 <span>入库位置:</span>
                 <el-cascader
                 <el-cascader
                   ref="cascaderAddr"
                   ref="cascaderAddr"
@@ -380,14 +390,29 @@
           </div>
           </div>
           <!-- 底部的返回按钮 -->
           <!-- 底部的返回按钮 -->
           <div class="btn">
           <div class="btn">
-            <el-button type="primary" @click="begEdit" v-if="userLogo"
-              >申请编辑</el-button
-            >
             <el-button @click="$router.go(-1)">返 回</el-button>
             <el-button @click="$router.go(-1)">返 回</el-button>
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
+    <!-- 点击申请移库出现的弹窗 -->
+    <el-dialog title="申请移库" :visible.sync="moveDialog">
+      <div class="block">
+        <span class="demonstration">移库位置:</span>
+        <el-cascader
+          style="width:500px"
+          :props="{ value: 'id', label: 'name' }"
+          v-model="moveValue"
+          :options="options"
+          @change="handleChange"
+        ></el-cascader>
+      </div>
+      <div class="moveBtn">
+          <el-button type="primary"  @click="moveOk"
+            >确 定</el-button
+          >
+      </div>
+    </el-dialog>
     <!-- 点击操作记录出现的弹窗 -->
     <!-- 点击操作记录出现的弹窗 -->
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
     <el-dialog title="操作记录" :visible.sync="dialogTableVisible">
       <el-table
       <el-table
@@ -460,6 +485,9 @@ export default {
   data () {
   data () {
     // 这里存放数据
     // 这里存放数据
     return {
     return {
+      moveValue: null,
+      moveDialog: false,
+      // 申请移库
       total: 0,
       total: 0,
       myData: {
       myData: {
         goodsId: null,
         goodsId: null,
@@ -501,6 +529,9 @@ export default {
   },
   },
   // 方法集合
   // 方法集合
   methods: {
   methods: {
+    // 申请移库
+    handleChange () {},
+    moveOk () {},
     // 封装获取列表接口方法
     // 封装获取列表接口方法
     async getlist (data) {
     async getlist (data) {
       const res = await getRecord(data)
       const res = await getRecord(data)
@@ -651,6 +682,20 @@ export default {
 }
 }
 </script>
 </script>
 <style lang='less' scoped>
 <style lang='less' scoped>
+.moveBtn{
+  position: absolute;
+  bottom: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+}
+/deep/.el-dialog{
+  height: 400px;
+}
+.block{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
 .paging {
 .paging {
   width: 100%;
   width: 100%;
   margin-top: 20px;
   margin-top: 20px;
@@ -799,7 +844,7 @@ body .el-table::before {
     position: relative;
     position: relative;
     .daochu {
     .daochu {
       position: absolute;
       position: absolute;
-      right: 130px;
+      right: 80px;
       top: 12px;
       top: 12px;
     }
     }
     display: flex;
     display: flex;