Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/api/V2/warehouse/index.js

@@ -72,7 +72,8 @@ export const API_POST_EDIT_INVENTORYCOSTINFO = '/inventoryCostInfo/api/editInven
 export const API_GET_WEIGHTEDDETAILS = '/weightedDetails/selectInventoryCostInfo'
 // 库
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
-
+// 出入库任务
+export const API_GET_WAREHOUSERESPONSIBLE = "/warehouseBaseInfo/selectResponsible"
 
 
 

src/model/warehouse/index.js

@@ -34,7 +34,8 @@ import {
     API_POST_ADD_INVENTORYCOSTINFO,
     API_POST_EDIT_INVENTORYCOSTINFO,
     API_GET_WEIGHTEDDETAILS,
-    API_GET_WAREHOUSE
+    API_GET_WAREHOUSE,
+    API_GET_WAREHOUSERESPONSIBLE
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -106,7 +107,5 @@ export const editinventory = appRx.post(API_POST_EDIT_INVENTORYCOSTINFO,errorCat
 export const weighteddetails = appRx.get(API_GET_WEIGHTEDDETAILS,errorCatcher, errorHandle, filter)
 // 编辑库点费用
 export const getwarehousebase = appRx.get(API_GET_WAREHOUSE,errorCatcher, errorHandle, filter)
-
-
-
-
+//负者人
+export const getsponsible = appRx.get(API_GET_WAREHOUSERESPONSIBLE,errorCatcher, errorHandle, filter)

src/views/platformaudit/grainPulseDynamic.vue

@@ -139,7 +139,7 @@
         </el-form-item>
         <el-form-item label="附件" :label-width="formLabelWidth">
           <div :key="index" v-for="(item, index) in SettledCompanyDynamicsList.address">
-          <img style="float:left" v-if="item" :src="item" class="avatar">
+          <img  style="float:left" v-if="item" :src="item" class="avatar">
           </div>
         </el-form-item>
       </el-form>
@@ -153,6 +153,7 @@
         </span>
       </div>
     </el-dialog>
+    
   </div>
 </template>
 <script>
@@ -186,7 +187,7 @@ export default {
       dialogViewSpareMoney: false,
       // 表格显示数据
       tableDate: [],
-
+      wrapstatus:false,
       // 是否显示
       showType: true,
       // 年
@@ -196,6 +197,7 @@ export default {
       deptBudgetTotal: 0,
       searchTypeText: '待审核',
       searchKeyWord: '',
+      imgUrl:'',
       // 提交类型
       submitType: true,
       size: 10,
@@ -232,6 +234,7 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    
     getSpanArr(data) {
       let that = this
       //页面展示的数据，不一定是全部的数据，所以每次都清空之前存储的 保证遍历的数据是最新的数据。以免造成数据渲染混乱
@@ -616,4 +619,7 @@ export default {
   height: 178px;
   display: block;
 }
+.shade{
+background:rgba(0,0,0,0.1);
+}
 </style>

src/views/platformaudit/grainmerchantreview.vue

@@ -255,27 +255,27 @@
         style="display: inline-block; margin: 5px"
         v-if='accessoryimages.businessLicenseAddressUrl'
       >
-        <img width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
+        <img  @click='magnify(accessoryimages.businessLicenseAddressUrl)' width="100" height="100" :src="accessoryimages.businessLicenseAddressUrl" alt="" />
       </div>
       <div
         style="display: inline-block; margin: 5px"
       >
-        <img width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
+        <img @click='magnify(accessoryimages.cardAddressUrl)' width="100" height="100" :src="accessoryimages.cardAddressUrl" alt="" />
       </div>
       <div
         style="display: inline-block; margin: 5px"
       >
-        <img width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
+        <img @click='magnify(accessoryimages.cardAddressUrl1)' width="100" height="100" :src="accessoryimages.cardAddressUrl1" alt="" />
       </div>
       <div
         style="display: inline-block; margin: 5px"
       >
-        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
+        <img @click='magnify(accessoryimages.payeeAddressUrl)' width="100" height="100" :src="accessoryimages.payeeAddressUrl" alt="" />
       </div>
       <div
         style="display: inline-block; margin: 5px"
       >
-        <img width="100" height="100" :src="accessoryimages.payeeAddressUrl1" alt="" />
+        <img @click='magnify(accessoryimages.payeeAddressUrl1)' width="100" height="100" :src="accessoryimages.payeeAddressUrl1" alt="" />
       </div>
     </WinseaContentModal>
     <WinseaContentModal
@@ -284,8 +284,11 @@
       @on-cancel="handleClose1"
     >
       <p>查看附件</p>
-      <img width="100" height="100" :src="accessurl" alt="" />
+      <img @click='magnify(item)' width="100" height="100" :src="accessurl" alt="" />
     </WinseaContentModal>
+    <div @click='colseshade' class='shade' v-if='wrapstatus'>
+      <img style='width:60%;' :src="imgUrl" alt="">
+    </div>
   </div>
 </template>
 <script>
@@ -322,6 +325,7 @@ export default {
       tableDate: [],
       // 是否显示
       showType: true,
+      wrapstatus:false,
       // 年
       year: '',
       accessoryimages:{},
@@ -385,6 +389,13 @@ export default {
     this.showType = this.isShow
   },
   methods: {
+    magnify(item){
+      this.wrapstatus=true
+      this.imgUrl=item
+    },
+    colseshade(){
+      this.wrapstatus=false
+    },
     expandsHandle(row) {
       row.expandsStatus = !row.expandsStatus
       this.$refs.expandstable.toggleRowExpansion(row)
@@ -685,4 +696,22 @@ export default {
 /deep/.el-table td {
   border-right: 1px solid #eee;
 }
+.shade{
+background:rgba(0,0,0,0.1);
+position:fixed;
+width:100%;
+height:100%;
+top:0;left:0;
+z-index:1026;
+text-align:center;
+overflow: scroll;
+}
+.shade img{
+  position:absolute;
+  top:0;
+  left:0;
+  bottom:0;
+  right:0;
+  margin:auto;
+}
 </style>

src/views/warehouse/warehouseManagementList.vue

@@ -278,6 +278,7 @@ import {
   export1,
   editstatus,
   billoperatehis,
+  getsponsible,
   clearancee,
 } from '@/model/warehouse/index'
 import { downloadFile } from '@/utils/batchDown'
@@ -611,6 +612,12 @@ export default {
         .then((response) => {
           this.warehouseList = response
         })
+        getsponsible({
+        compId: sessionStorage.getItem('ws-pf_compId')
+      }).toPromise()
+        .then((response) => {
+          console.log(response)
+        })
     },
     editClick(row) {
       var status = ''