支持入库单旧数据图片查看

src/views/profitable/expenseallot.vue

@@ -78,7 +78,7 @@
           <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
             <template slot-scope="scope">
                <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
-                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
+                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+item.goodsSource" :value="item.time"
                   style="color: #8890b1" />
               </ws-select>
             </template>
@@ -89,6 +89,8 @@
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
           <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
@@ -211,7 +213,7 @@
           .then(response => {
             for (let i = 0; i < response.length; i++) {
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
-              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight})
+              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight,goodsSource:response[i].goodsSource})
             }
             this.$set(this.datelist,index,JSON.parse(JSON.stringify(arr)))
           })
@@ -270,6 +272,7 @@
           if(this.datelist[index][i].time==e){
             item.orderId=this.datelist[index][i].id
             item.inWarehouseWeight=this.datelist[index][i].weight
+            item.goodsSource=this.datelist[index][i].goodsSource
           }
         }
         if(this.moneys=='按重量自动分配'){
@@ -327,7 +330,7 @@
             }
           }
         this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
-         if(this.deptBudgetList.expensesPurpose==1){
+         if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
         var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){

src/views/profitable/expenseallotaduit.vue

@@ -15,6 +15,8 @@
           <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />
@@ -57,12 +59,12 @@
           </div>
         </el-form-item>
         </el-form>
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3' style='width:90%;margin:10px auto;'>
+        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;display:flex;justify-content: space-between;'>
             <div>费用分配</div><span>合计分配：{{amount}}元</span>  </div>
           <!-- <div> -->
           <el-table :data="feeDetailsDistributions">
-            <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+            <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.warehouseName" placeholder="选择仓库" >
                   <ws-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -70,7 +72,7 @@
                 </ws-select>
               </template>
             </el-table-column>
-            <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="日期">
+            <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.receiptDocDate" placeholder="选择日期" >
                   <ws-option v-for="item in datelist" :key="item.time" :label="item.time" :value="item.time"
@@ -84,6 +86,8 @@
                 value-format="yyyy-MM-dd"   ></el-date-picker>
               </template>
             </el-table-column>
+            <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
             <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
                 <template slot-scope="scope">
                   <ws-select disabled v-model="scope.row.goodsSource" placeholder="选择货源">

src/views/profitable/expensemanagementdetails.vue

@@ -30,6 +30,11 @@
           <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">收入</el-button>
           <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">支出</el-button>
+          <el-button style="margin-left:30px !important;" @click="costChange('')" :type="expensesPurpose == ''?'primary':''">全部费用</el-button>
+          <el-button @click="costChange(3)" :type="expensesPurpose == 3?'primary':''">库点费用</el-button>
+          <el-button @click="costChange(1)" :type="expensesPurpose == 1?'primary':''">合同费用</el-button>
+          <el-button @click="costChange(5)" :type="expensesPurpose == 5?'primary':''">经营性费用</el-button>
+          <el-button @click="costChange(2)" :type="expensesPurpose == 2?'primary':''">运费</el-button>
         </el-col>
         <el-col style='text-align:right;' :span="6">
           <el-badge v-if="approveStatus" is-dot class="item">
@@ -193,6 +198,7 @@
         currentPage: 1,
         pageSize: 10,
         size:9,
+        expensesPurpose:'',
         recordList:[],
         compId:localStorage.getItem('ws-pf_compId'),
         dialogVisible1:false,
@@ -348,6 +354,10 @@
         this.searchType = num
         this.getList()
       },
+      costChange(num){
+        this.expensesPurpose = num
+        this.getList()
+      },
       edit(row){
         this.$router.push({name:'cashoutedit',query:{id:row.id}})
       },
@@ -471,7 +481,8 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
-            searchType:this.searchType
+            searchType:this.searchType,
+            expensesPurpose:this.expensesPurpose
           })
           .toPromise()
           .then(response => {

src/views/profitable/expensemanagentedit.vue

@@ -18,6 +18,8 @@
          <el-form-item  label-width='100px' label="用途" span="1" prop="purpose" class="readonly">
             <ws-select disabled v-model="deptBudgetList.expensesPurpose" placeholder="" class="typeselect" >
               <ws-option label="合同费用" value="1"
+                style="color: #8890b1" />
+                <ws-option label="运费" value="2"
                 style="color: #8890b1" />
                 <ws-option label="库点费用" value="3"
                 style="color: #8890b1" />
@@ -65,8 +67,8 @@
        />
         </el-form-item>
         </el-form>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' class='expensetitle'>费用分配</div>
-        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"' style='margin:0  auto 10px;width:90%;'>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' class='expensetitle'>费用分配</div>
+        <div v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2' style='margin:0  auto 10px;width:90%;'>
             <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
@@ -92,8 +94,8 @@
         </ws-select>
         <span v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
-        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+        <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
             <template slot-scope="scope">
               <el-select v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.$index)})">
                 <el-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -101,10 +103,10 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="日期">
+          <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
             <template slot-scope="scope">
                <ws-select v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row,scope.$index)})">
-                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time" :value="item.time"
+                <ws-option v-for="item in datelist[scope.$index]" :key="item.time" :label="item.time+'/'+item.goodsSource" :value="item.time"
                   style="color: #8890b1" />
               </ws-select>
             </template>
@@ -115,6 +117,8 @@
               value-format="yyyy-MM-dd"   ></el-date-picker>
             </template>
           </el-table-column>
+          <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
           <el-table-column v-if='deptBudgetList.purpose=="库点费用"' prop="date" label="货源">
               <template slot-scope="scope">
                 <!-- {{scope.row.goodsourcelist}} -->
@@ -241,7 +245,7 @@ weight: 4000}]],
           .then(response => {
             for (let i = 0; i < response.length; i++) {
               response[i].issuingDate=response[i].issuingTime.split(' ')[0]
-              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight})
+              arr.push({time:response[i].issuingDate,id:response[i].id,weight:response[i].inWarehouseWeight,goodsSource:response[i].goodsSource})
             }
             this.$set(this.datelist,index,JSON.parse(JSON.stringify(arr)))
           })
@@ -391,7 +395,7 @@ weight: 4000}]],
             this.deptBudgetList.expenseAllocationInfoList=[]
           }
         }
-         if(this.deptBudgetList.expensesPurpose==1){
+         if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
         var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){
@@ -521,9 +525,32 @@ weight: 4000}]],
           if(row.id==0){
             this.feeDetailsDistributions.splice(row.index,1)
           }else{
+            this.feeDetailsDistributions.splice(row.index,1)
+            var data=localStorage.getItem('expensebh')
+            var data1=[]
+            for (let i = 0; i < data.length; i++) {
+              if(data[i].id==row.id){
+                var data1=data.splice(row.i,1)
+              }
+            }
+            if(data1.length>0){
+              localStorage.setItem('expensebh',data1)
+            }else{
+              localStorage.removeItem('expensebh')
+            }
+            
             deloneallocationinfo({id:row.id}).toPromise().then((response) => {
             })
+            
+            
+            
           }
+        }else{
+          this.$message({
+                message: '费用分配必须保留一个!',
+                type: 'warning',
+          })
+          return
         }
         var weight=0
         var money=0
@@ -578,7 +605,7 @@ weight: 4000}]],
             this.paymentScreenshot=srcs
           }
           if(localStorage.getItem('expensebh')){
-            if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1){
+            if(this.deptBudgetList.expensesPurpose==3||this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
               this.getgoodsourcelist()
             }
           //   console.log(this.feeDetailsDistributions)
@@ -599,12 +626,12 @@ weight: 4000}]],
                     id:data[q].id,weight:data[q].inWarehouseWeight,goodsName:data[q].goodsName,goodsNameKey:data[q].goodsNameKey})
                 }
                 this.$set(this.goodsourcelist,i,JSON.parse(JSON.stringify(arr)))
-              }else if(this.deptBudgetList.expensesPurpose==1){
+              }else if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
                 const data  = await getwarehousingorder({contractNo:this.deptBudgetList.contractNo,warehouseName:this.feeDetailsDistributions[i].warehouseName}).toPromise()
                 this.datelist[i]=[]
                 for (let q = 0; q < data.length; q++) {
                   data[i].issuingDate=data[i].issuingTime.split(' ')[0]
-                  arr.push({time:data[i].issuingDate,id:data[i].id,weight:data[i].inWarehouseWeight})
+                  arr.push({time:data[i].issuingDate,id:data[i].id,weight:data[i].inWarehouseWeight,goodsSource:data[i].goodsSource})
                 }
                 this.$set(this.datelist,i,JSON.parse(JSON.stringify(arr)))
               }

src/views/profitable/expensemanagentlook.vue

@@ -18,6 +18,7 @@
             <div style='margin:0 0px 10px;font-weight:bold'>基本信息</div>
           <el-form-item label-width='100px' label="用途" span="1" prop="expensesPurpose">
               <span v-if='deptBudgetList.expensesPurpose==1'>合同费用</span>
+              <span v-if='deptBudgetList.expensesPurpose==2'>运费</span>
               <span v-if='deptBudgetList.expensesPurpose==3'>库点费用</span>
               <span v-if='deptBudgetList.expensesPurpose==5'>经营性费用</span>
           </el-form-item>
@@ -75,7 +76,7 @@
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
           <el-table :data="deptBudgetList.expenseAllocationInfoList">
-            <el-table-column v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
+            <el-table-column v-if='deptBudgetList.purpose=="合同费用"||deptBudgetList.expensesPurpose==2' prop="date" label="仓库名称" min-width="110">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.warehouseName" placeholder="选择仓库" @change="((value)=>{selectware(value, scope.row)})">
                   <ws-option v-for="item in warehouseList" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName"
@@ -83,7 +84,7 @@
                 </ws-select>
               </template>
             </el-table-column>
-            <el-table-column v-if='deptBudgetList.expensesPurpose==1' prop="date" label="日期">
+            <el-table-column v-if='deptBudgetList.expensesPurpose==1||deptBudgetList.expensesPurpose==2' prop="date" label="日期">
               <template slot-scope="scope">
                 <ws-select disabled v-model="scope.row.receiptDocDate" placeholder="选择日期" @change="((value)=>{selecttime(value, scope.row)})">
                   <ws-option v-for="item in datelist" :key="item.time" :label="item.time" :value="item.time"
@@ -97,6 +98,8 @@
                 value-format="yyyy-MM-dd"   ></el-date-picker>
               </template>
             </el-table-column>
+            <el-table-column v-if='deptBudgetList.expensesPurpose==2' prop="goodsSource" label="货源">
+            </el-table-column>
             <el-table-column v-if='deptBudgetList.expensesPurpose==3' prop="date" label="货源">
                 <template slot-scope="scope">
                   <ws-select disabled v-model="scope.row.orderId" placeholder="选择货源" @change="((value)=>{selectgoodsSource(value, scope.row)})">
@@ -170,13 +173,13 @@
         .toPromise()
         .then((response) => {
           this.deptBudgetList=response
-          // this.srcList=[]
-          // var arr=response.addressUrl.split(',')
-          // for (let i = 0; i < arr.length; i++) {
-          //   if(arr[i]!=''){
-          //     this.srcList.push(arr[i])
-          //   }
-          // }
+          this.srcList=[]
+          var arr=response.addressUrl.split(',')
+          for (let i = 0; i < arr.length; i++) {
+            if(arr[i]!=''){
+              this.srcList.push(arr[i])
+            }
+          }
           if(this.deptBudgetList.expensesPurpose==1){
               getpayeeinfo({compId:localStorage.getItem('ws-pf_compId'),contractNo:response.contractNo}).toPromise()
               .then((response1) => {

src/views/tranManagement/tranManagementReceivingloading.vue

@@ -300,13 +300,21 @@
                 </template>
               </ws-form-item>
               <!--箱号-->
-              <ws-form-item label="箱号:" span="1" prop="caseNo">
+              <ws-form-item label="箱号-1:" span="1" prop="caseNo">
                 <span>{{ item.caseNo }}</span>
               </ws-form-item>
               <!--封号-->
-              <ws-form-item label="封号:" span="1" prop="titleNo">
+              <ws-form-item label="封号-1:" span="1" prop="titleNo">
                 <span>{{ item.titleNo }}</span>
               </ws-form-item>
+              <!--箱号-->
+              <ws-form-item label="箱号-2:" span="1" prop="caseNoOther">
+                <span>{{ item.caseNoOther }}</span>
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item label="封号-2:" span="1" prop="titleNoOther">
+                <span>{{ item.titleNoOther }}</span>
+              </ws-form-item>
               <!--单价 -->
               <ws-form-item label="单价（元/吨）:" span="1" v-if="deptBudgetList.priceType!=null&&deptBudgetList.priceType=='随行就市'" prop="contractPrice">
                 <ws-input

src/views/tranManagement/tranManagementTransporFeedback.vue

@@ -158,13 +158,21 @@
               </template>
             </ws-form-item>
             <!--箱号-->
-            <ws-form-item label="箱号:" span="1" prop="caseNo">
+            <ws-form-item label="箱号-1:" span="1" prop="caseNo">
               <span>{{ item.caseNo }}</span>
             </ws-form-item>
             <!--封号-->
-            <ws-form-item label="封号:" span="1" prop="titleNo">
+            <ws-form-item label="封号-1:" span="1" prop="titleNo">
               <span>{{ item.titleNo }}</span>
             </ws-form-item>
+            <!--箱号-->
+            <ws-form-item label="箱号-2:" span="1" prop="caseNoOther">
+                <span>{{ item.caseNoOther }}</span>
+              </ws-form-item>
+              <!--封号-->
+              <ws-form-item label="封号-2:" span="1" prop="titleNoOther">
+                <span>{{ item.titleNoOther }}</span>
+              </ws-form-item>
             <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '未签合同'" class="signStatus">
               {{ item.signStatus }}</div>
             <div v-show="item.temporaryDriverFlag == 0 && item.signStatus == '已签合同'" class="signStatus1">

src/views/warehousenew/warehousingOrder.vue

@@ -424,14 +424,17 @@
         </span>
     </el-dialog>
     <el-dialog width='50%' :visible.sync="accessoryTFs" title="附件" top="20vh">
-      <!-- <div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
+      <div v-if="appendixIdss.length>0&&appendixIdss[0].indexOf('http')!=-1">
+<div v-for="(item,index) in appendixIdss" :key="'fujian'+index" >
        <el-image 
         style="width: 100px; height: 100px"
         :src="item" 
         :preview-src-list="appendixIdss">
       </el-image>
-      </div> -->
-      <ws-upload ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
+      </div>
+      </div>
+      
+      <ws-upload v-if="appendixIdss.length>0&&appendixIdss[0].indexOf('http')==-1" ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
         accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
     </el-dialog>
     <el-dialog width='30%' :visible.sync="dialogVisible1" title="费用" top="20vh">
@@ -711,17 +714,20 @@ import { findLastIndexOfIterate } from 'xe-utils/methods'
       fujian(row) {
         this.id = row.id
         this.accessoryTFs = true
-        // if(row.addressUrl.split(',')){
-        //   var arr=row.addressUrl.split(',')
-        //   this.dataList=[]
-        //   for(var i=0;i<arr.length;i++){
-        //     this.dataList.push({url:arr[i]})
-        //   }
-        //   this.appendixIdss=arr
-        //   this.paymentScreenshot=arr
-        // }
-        this.appendixIdss=row.addressUrl
-        
+        console.log(row.addressUrl.indexOf('http'))
+        if(row.addressUrl.indexOf('http')!=-1){
+          if(row.addressUrl.split(',')){
+            var arr=row.addressUrl.split(',')
+            this.dataList=[]
+            for(var i=0;i<arr.length;i++){
+              this.dataList.push({url:arr[i]})
+            }
+            this.appendixIdss=arr
+            this.paymentScreenshot=arr
+          }
+        }else{
+          this.appendixIdss=row.addressUrl
+        }
         console.log(this.appendixIdss)
       },
       lookRemark(row) {