gjy 2 年之前
父節點
當前提交
eab4f3855d

+ 0 - 1
src/api/V2/warehouse/index.js

@@ -11,7 +11,6 @@ export const API_POST_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse
 export const API_GET_WAREHOUSE_DELETELIST = '/warehouseBaseInfo/selectAllWarehouse'
 export const API_GET_WAREHOUSE_DELETELIST = '/warehouseBaseInfo/selectAllWarehouse'
 //隐藏
 //隐藏
 export const API_POST_WAREHOUSE_HIDE = '/warehouseBaseInfo/api/editShow'
 export const API_POST_WAREHOUSE_HIDE = '/warehouseBaseInfo/api/editShow'
-
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 export const API_GET_WAREHOUSE_DELETE = '/warehouseBaseInfo/api/deleteWarehouse'
 
 
 //仓库编辑
 //仓库编辑

+ 9 - 4
src/views/profitable/expenseallot.vue

@@ -46,13 +46,14 @@
             </el-input>
             </el-input>
           </el-form-item>
           </el-form-item>
           <el-form-item label-width='100px' label="附件">
           <el-form-item label-width='100px' label="附件">
-          <div>
+          <div v-if='srcList.length>0'>
             <span v-for='item in srcList'><el-image
             <span v-for='item in srcList'><el-image
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               style="width: 100px; height: 100px;border:1px solid #000;display:inline-block;margin:10px;"
               :src="item"
               :src="item"
                :preview-src-list="srcList"></el-image></span>
                :preview-src-list="srcList"></el-image></span>
              
              
           </div>
           </div>
+          <div v-else>暂无附件</div>
         </el-form-item>
         </el-form-item>
         </el-form>
         </el-form>
         <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
         <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
@@ -394,7 +395,7 @@
           }
           }
         }
         }
        
        
-        this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
+        // this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.deptBudgetList.flag=3
         this.deptBudgetList.flag=3
         this.$confirm('确定提交分配信息', '提示', {
         this.$confirm('确定提交分配信息', '提示', {
             confirmButtonText: '确定',
             confirmButtonText: '确定',
@@ -453,8 +454,12 @@
           if(response.addressUrl){
           if(response.addressUrl){
             var arr=[]
             var arr=[]
             var srcs=response.addressUrl.split(',')
             var srcs=response.addressUrl.split(',')
-            this.paymentScreenshot=srcs
-            this.srcList=srcs
+            // this.paymentScreenshot=srcs
+            for (let i = 0; i < srcs.length; i++) {
+              arr.push(srcs[i])
+              
+            }
+            this.srcList=arr
           }
           }
           // if(response.expenseAllocationInfoList){
           // if(response.expenseAllocationInfoList){
           //   this.feeDetailsDistributions=response.expenseAllocationInfoList
           //   this.feeDetailsDistributions=response.expenseAllocationInfoList

+ 5 - 0
src/views/profitable/payment.vue

@@ -280,4 +280,9 @@
   /deep/.el-form-item {
   /deep/.el-form-item {
     // width: 50%;
     // width: 50%;
 }
 }
+/deep/.el-upload--picture-card{
+  width: 100px;
+  height:100px;
+  line-height:100px;
+}
 </style>
 </style>

+ 4 - 1
src/views/warehousenew/warehouseManagementList.vue

@@ -3,7 +3,10 @@
   <div class="container">
   <div class="container">
     <!-- 表格 -->
     <!-- 表格 -->
     <div class="top_form" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`">
     <div class="top_form" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`">
-      <div class="title"><span style="font-size:18px;font-weight: 600;margin-left:20px">今日储量明细</span><span style="color:#8890B1;font-size:16px">({{dateTime}})</span></div>
+      <div style='position:relative;' class="title">
+        <span style="font-size:18px;font-weight: 600;margin-left:20px">今日储量明细</span><span style="color:#8890B1;font-size:16px">({{dateTime}})</span>
+        <ws-button type="primary" v-hasPermission="`warehouseManagement.warehouse.warehouseInfo.kan`" @click="handleall()" style="margin-left:20px;position:absolute;right:10px;top:50%;transform: translateY(-50%);">库存明细</ws-button>
+        </div>
       <el-table :data="tableData" style="width: 100%;margin-top:20px">
       <el-table :data="tableData" style="width: 100%;margin-top:20px">
       <el-table-column :prop="item" :label="item" show-overflow-tooltip v-for="(item, index) in tableHeader" :key="index"></el-table-column>
       <el-table-column :prop="item" :label="item" show-overflow-tooltip v-for="(item, index) in tableHeader" :key="index"></el-table-column>
     </el-table>
     </el-table>