Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

src/views/statisticalReport/components/salesLogisticsStatistics/saleChemicalCokeForm.vue

@@ -74,6 +74,11 @@
             style="width: 50px;"
           ></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="dealWithOverWeight">
+            超重出厂
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table">
@@ -87,6 +92,44 @@
         :pageSize="pageSize"
       ></dilTable>
     </div>
+    <el-dialog :visible.sync="disvisiable">
+      <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="updateCanwork"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -96,6 +139,11 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      orderNumber: null,
+      orderId:null,
+      disabled: false,
+      capacityName:null,
+      disvisiable:false,
       wareHouse: null,
       inputMaterial: null,
       shiyHeigth: 140,
@@ -186,6 +234,66 @@ export default {
     //     }
     //   }
     // },
+    dealWithOverWeight(){
+      this.disvisiable=true
+    },
+    //以下是运力边输边查搜索
+    querySearchCapacity(queryString, cb) {
+      if (queryString.length < 3) {
+        return
+      }
+      this.axios
+        .get('/api/v1/uc/getCapacityNumber?index=' + queryString)
+        .then(res => {
+          if (res.data.code == '200') {
+            var restaurantsCarrier = res.data.data
+            console.log(restaurantsCarrier, 'restaurantsCarrier')
+            var results = queryString
+              ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
+              : restaurantsCarrier
+            // 调用 callback 返回建议列表的数据
+            cb(results)
+          }
+        })
+    },
+    createFilterCarrier(queryString) {
+      return restaurantsCarrier => {
+        return (
+          restaurantsCarrier.capacityNumber
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        )
+      }
+    },
+    updateCanwork() {
+      console.log(this.orderNumber)
+      this.axios
+        .post('/api/v1/bp/updateOrderCanWork?orderNumber=' + this.orderNumber)
+        .then(res => {
+          this.$message.success('修改成功')
+          this.$router.go(0)
+        })
+    },
+    //运力弹出层
+    handleSelectCapacity(item) {
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
+      this.axios
+        .get('/api/v1/uc/getOrderNumber?capacityId=' + this.capacityId)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.orderId = res.data.data.orderId
+            this.orderNumber = res.data.data.orderNumber
+            this.axios
+              .get('/api/v1/uc/getMaterialIdByOrderId?orderId=' + this.orderId)
+              .then(res => {
+                if (res.data.code == '200') {
+                  this.materialList = res.data.data
+                }
+              })
+          }
+        })
+    },
     refresh() {
       this.$router.go(0);
     },

src/views/statisticalReport/components/salesLogisticsStatistics/saleCoproductForm.vue

@@ -66,6 +66,11 @@
             style="width: 50px;"
           ></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="dealWithOverWeight">
+            超重出厂
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
     <div class="table">
@@ -79,6 +84,44 @@
         :pageSize="pageSize"
       ></dilTable>
     </div>
+    <el-dialog :visible.sync="disvisiable">
+      <div class="admin2">
+              <div class="carrier from">
+                <el-form
+                  :inline="true"
+                  class="demo-form-inline"
+                  label-width="80px"
+                >
+                  <el-form-item label="车牌号:">
+                    <el-autocomplete
+                      class="inline-input"
+                      v-model="capacityName"
+                      :fetch-suggestions="querySearchCapacity"
+                      placeholder="车牌号"
+                      :trigger-on-focus="false"
+                      @select="handleSelectCapacity"
+                    >
+                      <template slot-scope="{ item }">
+                        <div class="name">{{ item.capacityNumber }}</div>
+                      </template>
+                    </el-autocomplete>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <div class="poundNo from">
+                <span class="text">运输订单号:</span>
+                <el-input v-model="orderNumber" disabled></el-input>
+              </div>
+              <div class="button_box">
+                <el-button
+                  type="primary"
+                  @click="updateCanwork"
+                  :disabled="disabled"
+                  >确认</el-button
+                >
+              </div>
+            </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -88,6 +131,11 @@ import { getCookie } from "@/utils/util.js";
 export default {
   data() {
     return {
+      orderNumber: null,
+      orderId:null,
+      disabled: false,
+      capacityName:null,
+      disvisiable:false,
       shiyHeigth: 140,
       isHeigth: true,
       pageSize: 100,
@@ -163,6 +211,66 @@ export default {
     //     }
     //   }
     // },
+    dealWithOverWeight(){
+      this.disvisiable=true
+    },
+    //以下是运力边输边查搜索
+    querySearchCapacity(queryString, cb) {
+      if (queryString.length < 3) {
+        return
+      }
+      this.axios
+        .get('/api/v1/uc/getCapacityNumber?index=' + queryString)
+        .then(res => {
+          if (res.data.code == '200') {
+            var restaurantsCarrier = res.data.data
+            console.log(restaurantsCarrier, 'restaurantsCarrier')
+            var results = queryString
+              ? restaurantsCarrier.filter(this.createFilterCarrier(queryString))
+              : restaurantsCarrier
+            // 调用 callback 返回建议列表的数据
+            cb(results)
+          }
+        })
+    },
+    createFilterCarrier(queryString) {
+      return restaurantsCarrier => {
+        return (
+          restaurantsCarrier.capacityNumber
+            .toLowerCase()
+            .indexOf(queryString.toLowerCase()) > -1
+        )
+      }
+    },
+    updateCanwork() {
+      console.log(this.orderNumber)
+      this.axios
+        .post('/api/v1/bp/updateOrderCanWork?orderNumber=' + this.orderNumber)
+        .then(res => {
+          this.$message.success('修改成功')
+          this.$router.go(0)
+        })
+    },
+    //运力弹出层
+    handleSelectCapacity(item) {
+      this.capacityId = item.capacityId
+      this.capacityName = item.capacityNumber
+      this.axios
+        .get('/api/v1/uc/getOrderNumber?capacityId=' + this.capacityId)
+        .then(res => {
+          if (res.data.code == '200') {
+            this.orderId = res.data.data.orderId
+            this.orderNumber = res.data.data.orderNumber
+            this.axios
+              .get('/api/v1/uc/getMaterialIdByOrderId?orderId=' + this.orderId)
+              .then(res => {
+                if (res.data.code == '200') {
+                  this.materialList = res.data.data
+                }
+              })
+          }
+        })
+    },
     refresh() {
       this.$router.go(0);
     },

src/views/statisticalReport/components/salesLogisticsStatistics/saleSpelling.vue

@@ -0,0 +1,132 @@
+<template>
+  <div>
+    <div class="dateQuery">
+        <label class="el-form-item__label" style="width: auto;"
+            >订单日期：</label
+          >
+          <el-date-picker
+            v-model="startTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:150px"
+          >
+          </el-date-picker>
+          <span>至</span>
+          <el-date-picker
+            v-model="endTime"
+            type="date"
+            placeholder="选择日期"
+            style="width:150px"
+          >
+          </el-date-picker>
+          <el-button type="primary" class="btn" @click="onclick">
+            <i class="el-icon-search"></i>
+          </el-button>
+    </div>
+    <div class="saleSpellingtable">
+        <el-table
+        :data="saleSpellingData"
+        border="true"
+        >
+            <el-table-column
+            label="拼装数量"
+            prop="pinZhuang"
+            style="font-size:20px"
+            align="center"
+            size="medium"
+            >
+            </el-table-column>
+            <el-table-column
+            label="重庆直销部"
+            prop="chongQinSpellingData"
+            align="center"
+            size="medium"
+            >
+            </el-table-column>
+            <el-table-column
+            label="成都直销部"
+            prop="chengDuSpellingData"
+            align="center"
+            size="medium"
+            >
+            </el-table-column>
+            <el-table-column
+            label="工程部"
+            prop="gongChengSpellingData"
+            align="center"
+            size="medium"
+            >
+            </el-table-column>
+            <el-table-column
+            label="川东"
+            prop="chaungDongSpellingData"
+            align="center"
+            size="medium"
+            >
+            </el-table-column>
+            <el-table-column
+            label="合计"
+            prop="AllSpellingData"
+            align="center"
+            size="medium"
+            ></el-table-column>
+        </el-table>
+    </div>
+  </div>    
+</template>
+
+<script>
+export default{
+    data(){
+        return{
+            startTime:new Date,
+            endTime:new Date,
+            saleSpellingData:[],
+            date:null
+        }
+    },
+    created(){
+        this.getSpellingData();
+    },
+    methods:{
+        async getSpellingData(){
+          const loading = this.$loading({
+                lock: true,
+                text: '正在获取数据',
+                spinner: 'el-icon-loading',
+                background: 'rgba(0, 0, 0, 0.7)'
+              })
+            let start=this.dateChange(this.startTime)
+            let startDate=start.slice(0,10)+" 00:00:00"
+            let end=this.dateChange(this.endTime) 
+            let endDate=end.slice(0,10)+" 23:59:59"
+            let map={
+              startTime:startDate,
+              endTime:endDate
+            }
+            await this.axios.post('/api/v1/tms/getSaleSteelSpellingReport',map).then(res=>{
+                this.saleSpellingData=res.data.data
+            })
+            loading.close();
+        },
+        onclick(){
+          this.getSpellingData();
+        },
+        dateChange(date){
+          var dateee = new Date(date).toJSON();
+          return new Date(+new Date(dateee) + 8 * 3600 * 1000).toISOString().replace(/T/g, ' ').replace(/\.[\d]{3}Z/, '')
+        }
+    }
+}
+</script>
+
+<style scoped>
+.saleSpellingtable{
+    margin-top: 20px;
+    margin-left: 30px;
+}
+.dateQuery{
+  margin-top: 20px;
+  margin-left: 30px;
+}
+</style>

src/views/statisticalReport/router/index.js

@@ -38,6 +38,7 @@ import unloadShipWorkReport from '../components/wanzhouReport/unloadShipWorkRepo
 import wagonWorkReport from '../components/wanzhouReport/wagonWorkReport.vue'
 import saleSteelCarrierReport from '@/views/statisticalReport/components/salesLogisticsStatistics/saleSteelCarrierReport'
 import saleSteelReports from '@/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports'
+import saleSpelling from '@/views/statisticalReport/components/salesLogisticsStatistics/saleSpelling.vue'
 import mapTest from '../components/salesLogisticsStatistics/mapTest.vue'
 const unloadingSteelReports = () =>
   import(
@@ -257,6 +258,14 @@ const constantRouterMap = [
         },
         component: saleSteelReports
       },
+      {
+        path: 'saleSpelling',
+        name: 'saleSpelling',
+        meta: {
+          code: 'xtpzgl-yhgl'
+        },
+        component: saleSpelling
+      },
       {
         path: 'mapTest',
         name: 'mapTest',