1

src/components/approval/groupEmpowerMan.vue

@@ -58,6 +58,7 @@
                 background
                 :page-size="msg.pageSize"
                 layout="prev, pager, next"
+                :current-page.sync="msg.pageIndex"
                 :total="total">
             </el-pagination>
         </div>
@@ -172,7 +173,7 @@ export default {
                 );
 
             }).catch(() => {
-            this.$message.info('已取消删除！')
+            this.$message.info('已取消拒绝！')
         }); 
     }
   },

src/components/assetsman/outboundApplication.vue

+<template>
+  <div class="outboundApplication">
+    <div class="routerTitle">
+      <span class="pageTitle">出库申请</span>
+      <span
+        @click="morequery = !morequery"
+        style="display:inline-flex;align-items:center;cursor: pointer;"
+        class="f12 cd6"
+      >
+        <span style="margin-right:5px">高级查询</span>
+        <img
+          v-show="!morequery"
+          style="width:12px;height:12px;"
+          src="../../assets/img/more.png"
+          alt=""
+        />
+        <img
+          v-show="morequery"
+          class="roatImg"
+          style="width:12px;height:12px"
+          src="../../assets/img/more.png"
+          alt=""
+        />
+      </span>
+    </div>
+    <div class="padContent">
+        <ul v-show="morequery" class="queryul">
+          <li>
+            <el-select  size="small" v-model="msg.ApplyStatus" @change="msg.pageIndex=1,getList()">
+              <el-option 
+                v-for="item in ApplyStatusList"
+                :key="item.Id"
+                :label="item.Name"
+                :value="item.Id"
+               
+              >
+              </el-option>
+            </el-select>
+          </li>
+          <li>
+            <el-select  size="small" v-model="msg.OutStatus" @change="msg.pageIndex=1,getList()">
+              <el-option 
+                v-for="item in OutStatusList"
+                :key="item.Id"
+                :label="item.Name"
+                :value="item.Id"
+                
+              >
+              </el-option>
+            </el-select>
+          </li>
+        </ul>
+        <div>
+            <vxe-table stripe style="margin-top:15px" :loading="loading"
+            :data="tableData">
+            <vxe-table-column field="Name" title="资产状态">
+              <template  v-slot="{ row }">
+                <span class="commonStyle hoverSpan1"></span>
+                  <span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==1">待</span>
+                    <span class="ColorSpan huangSpan" v-if="row.ApplyStatus==2">已</span>
+                    <span class="ColorSpan purpleSpan" v-if="row.ApplyStatus==3">拒</span>
+              
+              </template>
+            </vxe-table-column>
+            <vxe-table-column field="MallBaseName" title="小程序名称"></vxe-table-column>
+            <vxe-table-column field="TenantName" title="商户名称"></vxe-table-column>
+            <vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column>
+            <vxe-table-column field="Delivered" title="已发货数"></vxe-table-column>
+            <vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column>
+            
+     
+            <vxe-table-column field="address" title="操作">
+                <template  v-slot="{ row }">
+                  <el-tooltip class="item" effect="dark" content="审批" placement="top">
+                    <img  @click="See(row,1)" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
+                </el-tooltip>
+                <el-tooltip class="item" effect="dark" content="拒绝" placement="top">
+                    <img  @click="See(row,2)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
+                </el-tooltip>
+              </template>
+            </vxe-table-column>
+        </vxe-table>
+        <el-pagination
+          @current-change="currentChange"
+          background
+          :page-size="msg.pageSize"
+          layout="prev, pager, next"
+          :current-page.sync="msg.pageIndex"
+          :total="total"
+        >
+        </el-pagination>
+        
+        </div>
+        
+    </div>
+    
+    <el-dialog
+            :title="isagree==1?'同意申请':'拒绝申请'"
+            :close-on-click-modal="false"
+            top="0"
+            :visible.sync="dialogState"
+            width="400px">
+            <el-form class="MyEditForm" label-width="0">
+                <el-form-item prop="Name" style="margin-left:60px;">
+                    <span class="label">理由</span>
+                    <el-input v-model="Updatemsg.ExamineReason" type="textarea"  placeholder="请输入"></el-input>
+                </el-form-item>
+                <div class="btnformItem">
+                    <span class="submitBtn" type="primary" @click="submitForm()">确定</span>
+                    <span class="exitBtn" @click="dialogState=false">取消</span>
+                </div>
+            </el-form>
+        </el-dialog>
+  </div>
+</template>
+
+<script>
+
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+export default {
+  name: "outboundApplication",
+  data() {
+    return {
+      
+        loading:false,
+      tableData:[],
+      morequery: false,
+      ApplyStatusList:[{Id:0,Name:'全部'},{Id:1,Name:'审核中'},{Id:2,Name:'通过'},{Id:3,Name:'拒绝'}],
+      OutStatusList:[{Id:0,Name:'全部'},{Id:1,Name:'未出库'},{Id:2,Name:'部分出库'},{Id:3,Name:'全部出库'}],
+      msg: {
+        pageIndex: 1,
+        pageSize: 15,
+        ApplyStatus: 0,
+        OutStatus: 0,
+      },
+      Updatemsg:{
+           ID:0,
+           ExamineReason:'',
+           ApplyStatus:0
+      },
+      total:0,
+      isagree:1, //同意为1 拒绝为2
+     dialogState:false,
+    };
+  },
+  mounted() {
+    this.getList();
+   
+  },
+  methods: {
+    
+    getList() {
+      
+      this.loading = true;
+      this.apiJavaPost(
+        "/api/WarehouseOut/GetApplyPageList",
+        this.msg,
+        res => {
+          this.loading = false;
+          if (res.data.resultCode === 1) {
+            this.tableData = res.data.data.pageData;
+            this.total = res.data.data.count;
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+      
+    },
+       currentChange(val) {
+        this.msg.pageIndex = val;
+        this.getList();
+    },
+    See(row,type){
+         this.Updatemsg.ID = row.ID;
+         this.Updatemsg.ApplyStatus = row.ApplyStatus;
+         this.Updatemsg.ExamineReason = '';
+        this.isagree =type;
+        this.dialogState=true
+    },
+    submitForm(){
+        if(this.isagree==2 && this.Updatemsg.ExamineReason == ''){
+            this.Error('请填写理由');
+            return
+        }
+         this.apiJavaPost(
+        "/api/WarehouseOut/UpdateWarehouseOutApply",
+        this.msg,
+        res => {
+         
+          if (res.data.resultCode === 1) {
+            this.dialogState=false;
+            this.getList()
+          } else {
+            this.Error(res.data.message);
+          }
+        },
+        null
+      );
+
+    }
+    
+  }
+};
+</script>
+
+<style>
+.outboundApplication .MyEditForm .baseform .el-form-item:nth-child(4n) {
+  margin-right: 0;
+}
+.outboundApplication .zczt1 {
+  background: #ffe4d5;
+  color: #ffa87c;
+}
+.outboundApplication .zczt2 {
+  background: #beeff0;
+  color: #089bab;
+}
+.outboundApplication .zczt3 {
+  background: #ffd6d5;
+  color: #ff7874;
+}
+.outboundApplication .zczt4 {
+  background: #d7d6ff;
+  color: #7b78ff;
+}
+.outboundApplication .Commonzczt {
+  display: inline-block;
+  width: 24px;
+  height: 24px;
+  line-height: 24px;
+  text-align: center;
+  border-radius: 50%;
+  font-size: 12px;
+  font-family: "Microsoft YaHei";
+}
+.outboundApplication {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/router/config.js

@@ -75,6 +75,13 @@ export default {
                     name: 'assetsList',
                     component: resolve => require(['@/components/assetsman/assetsList'], resolve),
                 },
+                //出库申请
+                {
+                    path: '/outboundApplication', 
+                    name: 'outboundApplication',
+                    component: resolve => require(['@/components/assetsman/outboundApplication'], resolve),
+                },
+                
                 // 派发&退库
                 {
                     path: '/PaiTui',