前端

public/static/payprint.html

@@ -1143,7 +1143,7 @@
         this.date = new Date().toLocaleString()
         // let _data = decodeURIComponent(this.getQueryVariable('dataList'))
         let _data  ={}
-        if(decodeURIComponent(localStorage.getItem('print_pay_data'))){
+        if(localStorage.getItem('print_pay_data')){
             _data=decodeURIComponent(localStorage.getItem('print_pay_data'))
         }
         else{

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -138,7 +138,7 @@
                   <el-select :disabled="disabled2" v-if="carNumberList.length > 0 && serviceManagementType == 3"
                     filterable clearable :allow-create="true"  v-model="deptBudgetList.carNo"
                     placeholder="请选择车牌号" class="typeselect" @change="carChange($event, 1)">
-                    <el-option v-for="item in carNumberList" :key="item.constKey" :label="item.carNo"
+                    <el-option v-for="item in carNumberList" :key="item.id" :label="item.carNo"
                       :value="item.carNo" />
                   </el-select>
                   <!-- <el-select @change='carchange' v-if="statusTypetext=='初检'&&editcar==false&&carstatus||statusTypetext=='确认'&&editcar==false&&carstatus" v-model="deptBudgetList.carNo" placeholder="请选择车牌号">
@@ -1026,7 +1026,7 @@ export default {
       })
     },
     carChange(e, status) {
-      console.log(this.carNumberList)
+      console.log(this.carNumberList,e)
       if (status == 1) {
         this.$set(this.deptBudgetList, 'customerName', this.carNumberList[e].shipperName)
         this.$set(this.deptBudgetList, 'customerPhone', this.carNumberList[e].shipperPhone)
@@ -3588,7 +3588,7 @@ export default {
                           titleNoOther: '',
                           carNo:''
                         }
-      console.log(this.taskflag,22222222)
+      // console.log(this.taskflag,22222222)
       getReceiptTaskNo({
             flag: this.taskflag,
             warehouseName: this.warehouseName,
@@ -3596,7 +3596,7 @@ export default {
           })
             .toPromise()
             .then((response) => {
-              console.log(response,1111111111111111)
+              // console.log(response,1111111111111111)
               this.taskNolist = response
       })
       this.getList()

src/views/outboundManagement/weighingManagementNew.vue

@@ -147,12 +147,13 @@
                         </el-select>
                       </ws-form-item>
                       <ws-form-item v-if="fleetNameList.length > 0 && tpyeNo == 1&&weighingList.outType == '汽运'" label="车队" span="1" prop="fleetName">
-                        <el-select @change="fleetNameChange" :disabled="recheck" v-model="weighingList.fleet" placeholder="非车队车辆">
+                        <el-select @change="fleetNameChange" v-if="!recheck" v-model="weighingList.fleetId" placeholder="非车队车辆">
                           <el-option  key="" label="非车队"
                             value="非车队" />
                           <el-option v-for="item in fleetNameList" :key="item.value" :label="item.fleetName"
-                            :value="item.fleetName" />
+                            :value="item.id" />
                         </el-select>
+                        <ws-input v-model="weighingList.fleet" maxlength="20" size="small" :disabled="recheck"/>
                       </ws-form-item>
                       <ws-form-item v-if=" weighingList.outType == '火运'" label="流向" span="1" prop="carNo">
                     <el-select :disabled="recheck1" filterable clearable
@@ -166,12 +167,12 @@
                       weighingList.outType == '集装箱船'||
                       weighingList.outType == '火运'
                     ">
-                        <el-input :maxlength="'7'" v-if="carjudge" v-model="weighingList.carNo" placeholder="请输入车牌号"
+                        <el-input :maxlength="'7'" v-if="carjudge||!carjudge&&tpyeNo==2&&!weighingList.tranCarNo" v-model="weighingList.carNo" placeholder="请输入车牌号"
                            size="small" :disabled="recheck1"/>
-                        <el-select v-else filterable clearable v-model="weighingList.carNo" placeholder="请选择车牌号"
+                        <el-select v-if="!carjudge&&tpyeNo==1||!carjudge&&tpyeNo==2&&weighingList.tranCarNo" filterable clearable v-model="weighingList.carId" placeholder="请选择车牌号"
                           class="typeselect" @change="carChange" :disabled="recheck1">
                           <el-option v-for="item in options2" :key="item.constKey"
-                            :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.carNo" />
+                            :label="item.carNo + '(' + item.tranCarNo + ')'" :value="item.id" />
                         </el-select>
                         <el-button type="primary" @click="carNoTypeChange" v-if="carstatus">{{ carChange1 }}</el-button>
                       </ws-form-item>
@@ -311,7 +312,7 @@
                 </div>
               </div>
 
-              <el-table @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
+              <el-table v-show="tpyeNo==2" @cell-click="listclick" :data="deliveryList" style="width: 100%; margin-top: 20px"
                 ref="deliveryList" border>
                 <el-table-column prop="number" width="120" label="业务编号"></el-table-column>
                 <el-table-column prop="carNumber" label="车牌号"></el-table-column>
@@ -487,6 +488,7 @@
         statusType: '3',
         warehouseType: 1,
         weighingList: {
+          carNumber: '',
           grossWeight: '',
           tare: '',
           selfLoading: 0,
@@ -1144,9 +1146,7 @@
 
       listclick(row) {
         if(this.tpyeNo == 2){
-          
-        }
-        this.id = row.id
+          this.id = row.id
         getweighing({
             id: row.id,
           })
@@ -1175,6 +1175,11 @@
             // this.weighingList.carNo =
               // response.qualityInspectionManagement.carNumber
         this.$set(this.weighingList,'carNo', response.qualityInspectionManagement.carNumber)
+        if(this.weighingList.inOutType=='移库出库'&&this.tpyeNo == 2){
+          this.options2=[]
+          this.options2.push({id:this.weighingList.carId,carNo:this.weighingList.carNo, tranCarNo:this.weighingList.tranCarNo,tranPrice:this.weighingList.freight })
+        }
+        // console.log(this.weighingList.carId)
             this.weighingList.boxNo = response.boxNo
             this.weighingList.boxNoOther = response.boxNoOther
             this.weighingList.titleNo = response.titleNo
@@ -1192,6 +1197,8 @@
               mildewGrain: '',
             }
           })
+        }
+        
         // if(){
 
         // }
@@ -2062,11 +2069,11 @@
       },
       carChange(e) {
         for (let i = 0; i < this.tranCarInfoList.length; i++) {
-          if (this.tranCarInfoList[i].carNo == this.weighingList.carNo) {
+          if (this.tranCarInfoList[i].id == this.weighingList.carId) {
+            this.weighingList.carNo = this.tranCarInfoList[i].carNo
             this.weighingList.carNumber = this.tranCarInfoList[i].carNo
             this.weighingList.tranCarNo = this.tranCarInfoList[i].tranCarNo
             this.weighingList.freight = this.tranCarInfoList[i].tranPrice
-            this.weighingList.carId = this.tranCarInfoList[i].id
           }
         }
       },
@@ -2078,7 +2085,8 @@
           this.carChange1 = '手动填写'
         }else{
           for (let i = 0; i < this.fleetNameList.length; i++) {
-            if (this.fleetNameList[i].carNo == this.weighingList.fleetName) {
+            if (this.fleetNameList[i].id == this.weighingList.fleetId) {
+              this.weighingList.fleetName=this.fleetNameList[i].carNo
               this.weighingList.freight = this.fleetNameList[i].tranPrice
               this.carjudge=true
               if (this.carjudge) {

src/views/taskManagement/supplyofgoods.vue

@@ -14,12 +14,19 @@
 		</el-row>
     <BaseHeaderLayout :leftSpan="16">
       <template slot="left">
-          <div style='width:50%;margin-right:10px;'>
+          <div style='width:40%;margin-right:10px;'>
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
           start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" @change='datechange' :picker-options="pickerOptions">
         </el-date-picker>
-  
           </div>
+          <div style='width:50%;margin-right:10px;display: flex;'>
+          <el-select v-model="goodsName" filterable placeholder="" @change="goodsNameChange" 
+            style="margin: 0 10px">
+            <el-option key="全部货名" label="全部货名" value="0" style="color: #8890b1" />
+            <el-option v-for="(item,index) in goodsList" :key="item.id" :label="item.constValue"
+              :value="(index+1)" style="color: #8890b1" />
+          </el-select>
+        </div>
         <ws-button :type="flag==0?'primary':''" @click="costsort(0)">按日期排序
         </ws-button>
         <ws-button :type="flag==1?'primary':''" @click="costsort(1)">按成本排序
@@ -94,6 +101,9 @@
     fmoney,
     EventBus
   } from 'base-core-lib'
+  import {
+    packList,
+  } from '@/model/contarct/index'
 // import { toFixed } from 'xe-utils/methods'
   export default {
     name: 'viewSpareMoney',
@@ -111,6 +121,7 @@
     },
     data() {
       return {
+        
         //弹出框
         dialogViewSpareMoney: false,
         dialogApproveFormVisible: false,
@@ -123,6 +134,8 @@
         showType: true,
         // 年
         year: '',
+        goodsName:'0',
+        goodsList:[],
         gainList: [],
         gainList1:[],
         flag:0,
@@ -193,6 +206,7 @@
         type:0,
         warehouseName: '',
         baseId:'',
+        goodsName1:'',
         deptBudgetTotal: 0,
         compId: localStorage.getItem('ws-pf_compId'),
         deptCircularPage: {},
@@ -210,12 +224,26 @@
       // this.showType = this.isShow
     // },
     mounted() {
+      packList({
+            constId: 'CON2',
+          })
+          .toPromise()
+          .then((response) => {
+            this.goodsList = response
+          })
       this.getNowTime()
       this.baseId=this.$route.query.baseId
       
       this.showType = this.isShow
     },
     methods: {
+      goodsNameChange(e){
+        console.log(e)
+        if(e!=0){
+          this.goodsName1=this.goodsList[e-1].constValue
+        }
+        this.getList()
+      },
       selectinOutType(){
         this.getList()
       },
@@ -231,6 +259,7 @@
             pageSize: this.pageSize,
             searchType: this.searchType,
             searchKeyWord: this.searchKeyWord,
+            
             // inOutType:this.inOutType,
             baseId:this.baseId,
             flag:this.flag
@@ -338,6 +367,7 @@
       getList() {
         this.startDate=this.value2[0]
         this.endDate=this.value2[1]
+        
          getSourceOfGoodsinfo({
             compId: localStorage.getItem('ws-pf_compId'),
             currentPage: this.currentPage,
@@ -345,6 +375,7 @@
             startDate:this.startDate,
             endDate:this.endDate,
             searchType: this.searchType,
+            goodsName:this.goodsName==0?'':this.goodsName1,
             searchKeyWord: this.searchKeyWord,
             // inOutType:this.inOutType,
             baseId:this.baseId,

src/views/taskManagement/tranManagementWarehouseInOutTaskAdd.vue

@@ -580,6 +580,9 @@
 						//  this.agent = response
 					})
 					this.dataList1.contractNo=localStorage.getItem('contractNo')
+					if(localStorage.getItem('weight')){
+						this.dataList1.weight=localStorage.getItem('weight')
+					}
 				}
 			}
 			if(localStorage.getItem('supplygoods1')){
@@ -884,11 +887,13 @@
 				}
 			},
 			changecontract1(e) {
+				localStorage.setItem('contractNo',e)
 				if (this.dataList1.taskTypeKey != 3) {
 					for (let i = 0; i < this.contractNoList1.length; i++) {
 						if (this.contractNoList1[i].contractNo == e) {
 							if(this.dataList1.inOutType=='收购入库'){
 								this.dataList1.weight=this.contractNoList1[i].weight
+								localStorage.setItem('weight',this.contractNoList1[i].weight)
 							}
 							this.inOutType=this.contractNoList1[i].inOutType
 							if(this.contractNoList1[i].priceType == '随行就市'){
@@ -919,6 +924,7 @@
 										})
 									}else{
 										this.$set(this.dataList1, 'weight', response.weight)
+										localStorage.setItem('weight',response.weight)
 									}
 									this.$set(
 										this.dataList1,
@@ -1621,6 +1627,7 @@
 				}
 			},
 			selectgoodsName(e) {
+
 				for (var i = 0; i < this.goodnameList.length; i++) {
 					if (this.goodnameList[i].constValue == e) {
 						this.dataList.goodsNameKey = this.goodnameList[i].constKey
@@ -1737,6 +1744,7 @@
 				}
 			},
 			tasktypechange(e) {
+				localStorage.setItem('taskTypeKey',e)
 				if (!this.$route.query.relevanceId) {
 					this.tasknumber()
 				}
@@ -1781,9 +1789,11 @@
 						this.$set(this.dataList, 'goodsNameKey', '1')
 						this.$set(this.dataList1, 'goodsName', '玉米')
 						this.$set(this.dataList1, 'goodsNameKey', '1')
+						this.flag = 1
 					}else if(localStorage.getItem('taskTypeKey') == 2){
 						this.$set(this.dataList1, 'inOutType', '采购入库')
 						this.$set(this.dataList1, 'inOutTypeKey', '2')
+						this.flag = 8
 					}else if(localStorage.getItem('taskTypeKey') == 3){
 						this.$set(this.dataList, 'inOutType', '移库出库')
 						this.$set(this.dataList, 'inOutTypeKey', '3')
@@ -1794,6 +1804,7 @@
 						this.$set(this.dataList, 'inOutTypeKey', '4')
 						this.$set(this.dataList1, 'inOutType', '退库')
 						this.$set(this.dataList1, 'inOutTypeKey', '4')
+						this.flag = 2
 					}
 					this.$set(this.dataList, 'grade', '一等品')
 					this.$set(this.dataList, 'gradeKey', '1')

src/views/tranManagement/component/routers/route.js

@@ -218,7 +218,7 @@ const tranManagementRouter = {
         module: 'tranManager.vehicleDispatching.car',
         permissicon: [],
         keepAlive: true,
-        _title:'汽车调度'
+        _title:'汽车调度历史'
       },
       hidden: true
     },

src/views/tranManagement/tranManagementVehicleDispatchinghistory.vue

@@ -304,27 +304,27 @@
       del(index, row,status) {
         if (row.status == null) {
           if(status==1){
-            if (this.deptBudgetList.tranCarInfoList1.length > 1) {
-              for (let i = 0; i < this.deptBudgetList.tranCarInfoList1.length; i++) {
-                console.log(this.deptBudgetList.tranCarInfoList1[i])
-                if(this.deptBudgetList.tranCarInfoList1[i].index){
-                  if(this.deptBudgetList.tranCarInfoList1[i].index==row.index){
-                    this.deptBudgetList.tranCarInfoList1.splice(i, 1)
+            if (this.deptBudgetList.records.length > 1) {
+              for (let i = 0; i < this.deptBudgetList.records.length; i++) {
+                console.log(this.deptBudgetList.records[i])
+                if(this.deptBudgetList.records[i].index){
+                  if(this.deptBudgetList.records[i].index==row.index){
+                    this.deptBudgetList.records.splice(i, 1)
                   }
                 }
               }
             }
           }else{
-            if (this.deptBudgetList.tranCarInfoList1.length > 1) {
-              this.deptBudgetList.tranCarInfoList1.splice(index, 1)
-              for (let i = index; i < this.deptBudgetList.tranCarInfoList1.length; i++) {
-                let number = Number(this.deptBudgetList.tranCarInfoList1[i].tranCarNo.split('C')[1]) - 1
+            if (this.deptBudgetList.records.length > 1) {
+              this.deptBudgetList.records.splice(index, 1)
+              for (let i = index; i < this.deptBudgetList.records.length; i++) {
+                let number = Number(this.deptBudgetList.records[i].tranCarNo.split('C')[1]) - 1
                 if (number < 10) {
-                  this.deptBudgetList.tranCarInfoList1[i].tranCarNo = 'C00' + number
+                  this.deptBudgetList.records[i].tranCarNo = 'C00' + number
                 } else if (number < 100) {
-                  this.deptBudgetList.tranCarInfoList1[i].tranCarNo = 'C0' + number
+                  this.deptBudgetList.records[i].tranCarNo = 'C0' + number
                 } else {
-                  this.deptBudgetList.tranCarInfoList1[i].tranCarNo = 'C' + number
+                  this.deptBudgetList.records[i].tranCarNo = 'C' + number
                 }
               }
             }