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

src/views/contractManagement/purchaseContract.vue

@@ -497,6 +497,10 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
+            if(response.records[i].completedQuantity){
+              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+            }
+            
             if (response.records[i].addressUrl != null) {
               if (response.records[i].addressUrl) {
                 response.records[i].addressUrlArray =

src/views/contractManagement/salesContract.vue

@@ -513,6 +513,9 @@ export default {
         .toPromise()
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
+            if(response.records[i].completedQuantity){
+              response.records[i].completedQuantity=response.records[i].completedQuantity.tofixed(3)
+            }
             if (response.records[i].addressUrl != null) {
               if (response.records[i].addressUrl != '') {
                 response.records[i].addressUrlArray =

src/views/home/index.vue

@@ -10,7 +10,7 @@
             <img src="../../../public/img/8b2c7255e9b19c71d68b33a08f20f74.png" alt="">
 
           </div>
-         <div class="right">
+          <div class="right">
             <div class="top">
               {{ nowDate }}
             </div>
@@ -58,11 +58,13 @@
                   </div>
                   <div class="item">
                     <p>装货车辆</p>
-                     <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span></p>
+                    <p><span class="number" style="color:#ffa523">{{carCount2}}</span><span class="number-text">台</span>
+                    </p>
                   </div>
                   <div class="item">
                     <p>卸货车辆</p>
-                     <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span></p>
+                    <p><span class="number" style="color:#2483ff">{{carCount3}}</span><span class="number-text">台</span>
+                    </p>
                   </div>
                 </div>
               </el-col>
@@ -74,7 +76,7 @@
             <el-row>
               <h3 class="content2-map">库点流向分布</h3>
               <div class="center-map">
-                <map-drag></map-drag>
+                <map-drag :listData=' mapInfo'></map-drag>
               </div>
             </el-row>
             <el-row>
@@ -96,7 +98,7 @@
             </el-row>
           </div>
           <el-row class="content2-aside">
-            <h3 class="left-title">采购合同完成进度</h3>
+            <h3 class="left-title">销售合同完成进度</h3>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart4" style="height: 288px;" class="roseChart"></div>
@@ -211,12 +213,13 @@
 
     data() {
       return {
-        totalReserves:'',
-        inventoryCost:'',
-        inventoryValue:'',
-        carCount1:'',
-        carCount2:'',
-        carCount3:'',
+        mapInfo: [],
+        totalReserves: '',
+        inventoryCost: '',
+        inventoryValue: '',
+        carCount1: '',
+        carCount2: '',
+        carCount3: '',
         chartsData: [],
         nowDate: null, //存放年月日变量
         nowTime: null, //存放时分秒变量
@@ -329,7 +332,7 @@
       this.getRouteList()
       // this.checkUserInfoDialog()
       // {
-        this.timer = setInterval(this.getTime, 1000);
+      this.timer = setInterval(this.getTime, 1000);
       // }
     },
     beforeDestroy() {
@@ -364,8 +367,9 @@
         this.carCount2 = res[6].biViewInfoList[1].count
         this.carCount3 = res[6].biViewInfoList[2].count
         this.inventoryCost = res[7].biViewInfoList[0].count
-        this.inventoryValue =  res[7].biViewInfoList[1].count
+        this.inventoryValue = res[7].biViewInfoList[1].count
         this.totalReserves = res[8].biViewInfoList
+        this.mapInfo = res[9]
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -455,7 +459,7 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-              graphicText = ' \n\n总量合计\n\n' +Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
 
               break;
             case 1:
@@ -471,7 +475,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-                graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -486,7 +490,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -501,7 +505,8 @@
               }]
               text = '合同总量'
               formatter = '{b}{c}吨 </br> 占比{d}%'
-               graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n总量合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+                break;
             case 4:
               // 圆环图各环节的颜色
               color = ['#247ef4', '#3a3b40'];
@@ -530,7 +535,7 @@
               }]
               text = '合同总额'
               formatter = '{b}{c}元 </br> 占比{d}%'
-               graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
               break;
           }
           myChart.setOption({
@@ -616,15 +621,14 @@
             app.dialogVisible = true
           })
         }
-        debugger
         console.log(this.totalReserves)
         let _x = []
         let _y = []
-        for(let i = 0;i<this.totalReserves.length;i++){
+        for (let i = 0; i < this.totalReserves.length; i++) {
           _x.push(this.totalReserves[i].name)
           _y.push(this.totalReserves[i].count)
         }
-        
+
         // 柱状图
         let myChart7 = app.$echarts.init(this.$refs.myEchart7);
         var zoption = {
@@ -648,10 +652,10 @@
               color: '#fff'
             }
           },
-        
+
           //  ------  X轴 ------
           xAxis: {
-          
+
             axisLabel: { // 坐标轴标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -661,7 +665,7 @@
               interval: 0,
               rotate: 40
             },
-         
+
             splitArea: { // 网格区域
               show: false // 是否显示，默认为false
             },
@@ -669,12 +673,12 @@
           },
           //   ------   y轴  ----------
           yAxis: {
-          
+
             axisLine: { // 坐标轴 轴线
               show: false, // 是否显示
-           
+
             },
-           
+
             axisLabel: { // 坐标轴的标签
               show: true, // 是否显示
               inside: false, // 是否朝内
@@ -1871,12 +1875,12 @@
     }
 
   }
-  .bottom-tip{
+
+  .bottom-tip {
     position: absolute;
     z-index: 11;
     color: #8c8c8d;
     right: 10px;
     bottom: 10px;
   }
-
 </style>

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -170,7 +170,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.selectVal) {
           localStorage.setItem(
-            'houseSelfCollect_house1',
+            'houseSelfCollect_house',
             JSON.stringify(this.warehouseList[i])
           )
           this.warehouseName = this.warehouseList[i].warehouseName
@@ -229,7 +229,7 @@ export default {
           // if(this.userJurisdiction){
           //   this.warehouseList.unshift({warehouseName:response[0].flag})
           // }
-          let _wareHouse = localStorage.getItem('houseSelfCollect_house1')
+          let _wareHouse = localStorage.getItem('houseSelfCollect_house')
           if (_wareHouse) {
             _wareHouse = JSON.parse(_wareHouse)
             this.selectVal = _wareHouse.id

src/views/houseSelfCollect/paymentManagement.vue

@@ -334,7 +334,7 @@ import download from '../../components/WsDownload/download'
         deptCircularPage: {},
         deptBudgetTotal: 0,
         paymentForm: false,
-        searchType: "",
+        searchType: '',
         searchTypeText: '',
         searchKeyWord: '',
         warehouseList: [],
@@ -503,8 +503,8 @@ this.$nextTick(() => {
         }
         console.log('开票', data)
         for(let i=0;i<this.modification.length;i++){
-          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款') {
-            this.$message.error('开票只能选择全部付款或部分付款！');
+          if(this.modification[i].status!='全部付款'&&this.modification[i].status!='部分付款'&&this.modification[i].status!='已通过') {
+            this.$message.error('开票只能选择全部付款或部分付款或已通过！');
               return
           }
         }

src/views/houseSelfCollect/weightCheck.vue

@@ -255,7 +255,7 @@
       this.weighingList.carNumber = this.$route.query.carNumber
       this.weighingList.goodsName = this.$route.query.goodsName
       this.weighingList.id = this.$route.query.id
-      this.relationId = this.$route.query.relationId
+      // this.relationId = this.$route.query.relationId
       this.monitorUrl1 = this.$route.query.monitorUrl1
       this.monitorUrl2 = this.$route.query.monitorUrl2
       this.warehouseId = this.$route.query.warehouseId
@@ -752,7 +752,7 @@
                         )
                       } else {
                         //累计售粮没有超上限完成毛检保存
-                        this.weighingList.relationId = this.relationId;
+                        // this.weighingList.relationId = this.relationId;
                         this.weighingList.secretaryWeigher = localStorage.getItem('ws-pf_staffName'),
                           grossWeight(this.weighingList)
                           .toPromise()

src/views/statisticalReport/stockSaleOutReportList.vue

@@ -39,7 +39,7 @@
             <span v-else>合同重量: 0 吨</span>
             <span v-if="outboundVolume">出库量: {{ outboundVolume }} 吨</span>
             <span v-else>出库量: 0 吨</span>
-            <span v-if="orderList.unitContractPrice">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
+            <span v-if="orderList.unitContractPrice&&this.tranType!='随行就市'">合同单价: {{ orderList.unitContractPrice }} 元/吨</span>
             <span v-else>合同单价: 0 元/吨</span>
             <span v-if="amountReceivable">应收: {{ amountReceivable }} 元</span>
             <span v-else>应收: 0 元</span>
@@ -101,6 +101,24 @@
         <el-table-column v-else-if="this.tranType=='散船'||this.tranType=='箱船'" class="table_td" prop="unloadingWeight"
           label="卸船净重（吨）"></el-table-column>
         <el-table-column class="table_td" prop="settlementWeight" label="结算重量（吨）"></el-table-column>
+        <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
+        <template slot-scope="scope">
+            <div class="inputChenge">
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
+                <span>{{scope.row.settlementPrice}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,2)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
+          </template></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额（元）"></el-table-column>
         <el-table-column class="table_td" prop="amountEdReceivable" label="已收金额（元）">
         </el-table-column>
@@ -147,13 +165,31 @@
             <div style='display:inline-block;' v-if="scope.row.identification == 'false'">
               <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
                 style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
-                @click="whether(scope.row)" alt="" />
+                @click="whether(scope.row,1)" alt="" />
             </div>
 
             <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
-              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row)"></i>
+              v-if="scope.row.identification == 'true'" @click="weightClick(scope.row,1)"></i>
           </template>
         </el-table-column>
+        <el-table-column class="table_td" prop="settlementPrice" width='130' label="结算单价（元/吨）">
+        <template slot-scope="scope">
+            <div class="inputChenge">
+              <el-input v-model="scope.row.settlementPrice" v-if="scope.row.identification1 == 'true'">
+              </el-input>
+              <div v-if="scope.row.identification1 == 'false'" class="inputs">
+                <span>{{scope.row.settlementPrice}}</span>
+              </div>
+            </div>
+            <div style='display:inline-block;' v-if="scope.row.identification1 == 'false'">
+              <img v-hasPermission="`report.goodsSaleOutReport.edit`" width="17" height="18"
+                style="vertical-align: text-top; position: relative; top: -1px" src="../../../public/img/edit.png"
+                @click="whether(scope.row,2)" alt="" />
+            </div>
+
+            <i class="el-icon-check" style="line-height: 29px; margin-left: 10px"
+              v-if="scope.row.identification1 == 'true'" @click="weightClick(scope.row,2)"></i>
+          </template></el-table-column>
         <el-table-column class="table_td" prop="amountIngReceivable" label="应收金额(元)">
           <template slot-scope="scope">
             <span v-if="scope.row.returnFlag == null">{{scope.row.amountIngReceivable.toFixed(2) }}</span>
@@ -462,10 +498,15 @@
         }
       },
       //修改结算重量
-      whether(row) {
-        row.identification = 'true'
+      whether(row,flag) {
+        if(flag==1){
+          row.identification = 'true'
+        }else{
+          row.identification1 = 'true'
+        }
+        
       },
-      weightClick(row) {
+      weightClick(row,flag) {
         if (
           row.settlementWeight > 200 ||
           row.settlementWeight < 1 ||
@@ -485,22 +526,44 @@
           })
           return
         }
-        this.$confirm(`确定要修改结算重量？`, {
+        var title=''
+        var data={}
+        if(flag==1){
+          title='确定要修改结算重量？'
+          data={
+                settlementWeight: row.settlementWeight,
+                id: row.id,
+                flag:flag
+              }
+        }else{
+          title='确定要修改结算单价？'
+          data={
+                settlementPrice: row.settlementPrice,
+                id: row.id,
+                flag:flag
+              }
+        }
+        this.$confirm(title, {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning',
           })
           .then(() => {
-            saleEditSettlementWeight({
-                settlementWeight: row.settlementWeight,
-                id: row.id,
-              })
+            saleEditSettlementWeight(data)
               .toPromise()
               .then((response) => {
-                this.$notify.success({
+                if(flag==1){
+                  this.$notify.success({
                   title: '成功',
                   message: '结算重量修改成功',
                 })
+                }else{
+                  this.$notify.success({
+                  title: '成功',
+                  message: '结算单价修改成功',
+                })
+                }
+                
                 this.getList(this.orderList.deliverType)
               })
               .catch(() => {
@@ -568,9 +631,9 @@
               sums[index] = '合计'
             } else if (
               index === 8 ||
-              index === 9 ||
               index === 10 ||
-              index === 11
+              index === 11 ||
+              index === 12
             ) {
               const values = data.map((item) => Number(item[column.property]))
               if (!values.every((value) => isNaN(value))) {
@@ -593,7 +656,7 @@
               if (index === 0) {
                 sums[index] = '合计'
               } else if (
-                index === 8 ||
+                index === 11 ||
                 index === 9 ||
                 index === 10 ||
                 index === 7
@@ -620,7 +683,7 @@
               } else if (
                 index === 11 ||
                 index === 9 ||
-                index === 10 ||
+                index === 13 ||
                 index === 12
               ) {
                 const values = data.map((item) => Number(item[column.property]))
@@ -644,7 +707,7 @@
                 sums[index] = '合计'
               } else if (
                 index === 11 ||
-                index === 9 ||
+                index === 12 ||
                 index === 10 ||
                 index === 8
               ) {
@@ -869,6 +932,7 @@
             let num = []
             for (var i = 0; i < response.records.length; i++) {
               response.records[i].identification = 'false'
+              response.records[i].identification1 = 'false'
               if (response.records[i].amountIngReceivable) {
                 this.amountReceivable += Number(response.records[i].amountIngReceivable.toFixed(2))
               }

src/views/warehouse/warehouseManagementGross.vue

@@ -1752,7 +1752,7 @@
         if (
           this.deptBudgetList.grossWeight &&
           this.deptBudgetList.tare &&
-          this.deptBudgetList.deductionWeight
+          (this.deptBudgetList.deductionWeight||this.deptBudgetList.deductionWeight == 0)
         ) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight -
@@ -1765,7 +1765,7 @@
         if (
           this.deptBudgetList.grossWeight &&
           this.deptBudgetList.tare &&
-          this.deptBudgetList.deductionWeight
+          (this.deptBudgetList.deductionWeight||this.deptBudgetList.deductionWeight == 0)
         ) {
           this.deptBudgetList.netWeight = Number(
             this.deptBudgetList.grossWeight -

src/views/warehouse/warehouseManagementIoss.vue

@@ -226,13 +226,13 @@ export default {
         this.deptBudgetList.cumulativeStockIn -
         this.deptBudgetList.cumulativeStockOut -
         this.deptBudgetList.physicalInventory
-      )
+      ).toFixed(3)
     },
     surplusInventory1: function () {
       return (
         this.deptBudgetList.cumulativeStockIn -
         this.deptBudgetList.cumulativeStockOut
-      )
+      ).toFixed(3)
     },
     inventoryRatio1: function () {
       var loss =
@@ -413,6 +413,8 @@ export default {
       })
         .toPromise()
         .then((response) => {
+          response.cumulativeStockIn=response.cumulativeStockIn.toFixed(3)
+          response.cumulativeStockOut=response.cumulativeStockOut.toFixed(3)
           this.deptBudgetList = response
         })
     },

src/views/warehouse/warehouseManagementList.vue

@@ -290,10 +290,10 @@
              </el-radio-group>
               </el-form-item>
               <el-form-item label="起始日期">
-              <el-date-picker type="date" placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
+              <el-date-picker value-format="yyyy-MM-dd" type="date"  placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
               </el-form-item>
               <el-form-item label="截止日期">
-              <el-date-picker type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
+              <el-date-picker  value-format="yyyy-MM-dd" type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
               </el-form-item>
                <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName" >
@@ -429,7 +429,7 @@ export default {
       if(this.headerText = "导出入库记录"){
         const { 
            data 
-           } = await postExport(this.parameter, {}, {
+           } = await postExport({startDate:this.parameter.startDate,endDate:this.parameter.endDate,warehouseName:this.parameter.warehouseName}, {}, {
           responseType: 'blob'
         }).toPromise()
         debugger