修改销售钢材

build/utils.js

@@ -15,8 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 // ['index','appoint'，'configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
+// let devModules = ['index', 'statisticalReport', 'queue']
 let devModules = ['all']
-// let devModules = ['all']
 //let devModules=['index']
 if (pathSrc.indexOf('node_modules') > -1) {
   devModules = require('../../../cors.js').devModules

src/components/main.vue

@@ -965,6 +965,7 @@ export default {
     } else {
       this.styleControll = false
     }
+    console.log(this.$route, 'this.route')
     console.log('获取到的orgCode+++++++++++++' + this.orgcodezs)
     this.getinformation()
   },

src/views/inward/components/inwardBillet/addInwardBillet.vue

@@ -644,7 +644,7 @@ export default {
         requirementUnloadUnitId: this.unloadPoint,
         capacityList: capacityList,
         count: this.count,
-        orgCode: getCookie('orgCode'),
+        orgCode: getCookie('userId'),
         isMeter: this.isMeter
       }
       console.log('map:', map)

src/views/queue/components/qmsEnFacotory/queueFStart.vue

@@ -121,74 +121,91 @@
             <!-- 是否可以勾选:selectable="selectInit" -->
             <el-table-column
               type="selection"
-              width="55"
+              width="45"
               reserve-selection
+              align="center"
               :selectable="selectInit"
             ></el-table-column>
+            <el-table-column label="装货点" width="120">
+              <template slot-scope="scope">
+                <el-select
+                  size="mini"
+                  v-model="scope.row.id"
+                  @change="changePriority(scope.row)"
+                >
+                  <el-option
+                    v-for="item in option"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="capacityNumber"
               label="车牌号"
               fit
               align="center"
+              width="150px"
             >
             </el-table-column>
             <el-table-column
               prop="listNodeOrder"
               label="序号"
               align="center"
-              width="80"
+              width="40"
             ></el-table-column>
-            <el-table-column prop="resultStartTime" label="排队开始时间">
+            <el-table-column
+              prop="resultStartTime"
+              label="排队开始时间"
+              align="center"
+              width="160"
+            >
             </el-table-column>
-            <el-table-column prop="consigneeName" label="客户" fit>
+            <el-table-column
+              prop="consigneeName"
+              label="客户"
+              fit
+              show-overflow-tooltip
+              width="180"
+            >
             </el-table-column>
-            <el-table-column prop="materialName" label="物资名称">
+            <el-table-column
+              prop="materialName"
+              label="物资名称"
+              min-width="200"
+            >
             </el-table-column>
             <el-table-column
               prop="steelMeter"
               label="钢材长度"
               align="center"
-              width="80px"
+              width="60"
             >
             </el-table-column>
             <el-table-column
               prop="materialSpecification"
               label="规格型号"
-              align="center"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
               prop="materialNumber"
               label="物资件数"
               align="center"
-              width="80px"
+              width="70"
             >
             </el-table-column>
-            <el-table-column label="装货点" width="100">
-              <template slot-scope="scope">
-                <el-select
-                  size="mini"
-                  v-model="scope.row.id"
-                  @change="changePriority(scope.row)"
-                >
-                  <el-option
-                    v-for="item in option"
-                    :key="item.id"
-                    :label="item.value"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column prop="driverTel" label="司机电话号码">
+            <el-table-column prop="driverTel" label="司机电话号码" width="120">
             </el-table-column>
-            <el-table-column prop="sureTime" label="可进厂确认时间">
+            <el-table-column prop="sureTime" label="可进厂确认时间" width="150">
             </el-table-column>
 
             <!-- <el-table-column prop="gatepostName" label="进厂门岗" width="80">
             </el-table-column> -->
-            <el-table-column fixed="right" label="操作" width="180">
+            <el-table-column fixed="right" label="操作" width="150">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -218,31 +235,60 @@
           >
             <el-table-column
               type="selection"
-              width="55"
+              width="45"
+              align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
+            <el-table-column label="装货点" width="120">
+              <template slot-scope="scope">
+                <el-select
+                  size="mini"
+                  v-model="scope.row.id"
+                  @change="changePriority(scope.row)"
+                >
+                  <el-option
+                    v-for="item in option"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="capacityNumber"
               label="车牌号"
               fit
               align="center"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               prop="listNodeOrder"
               label="序号"
               align="center"
-              width="80"
+              width="45"
             ></el-table-column>
-            <el-table-column prop="resultStartTime" label="排队开始时间">
+            <el-table-column
+              prop="resultStartTime"
+              label="排队开始时间"
+              width="160"
+            >
             </el-table-column>
-            <el-table-column prop="consigneeName" label="客户" fit>
+            <el-table-column
+              prop="consigneeName"
+              label="客户"
+              fit
+              width="180"
+              show-overflow-tooltip
+            >
             </el-table-column>
             <el-table-column
               prop="materialName"
               label="物资名称"
-              align="center"
+              min-width="200"
             >
             </el-table-column>
             <el-table-column
@@ -255,48 +301,31 @@
             <el-table-column
               prop="materialSpecification"
               label="规格型号"
-              align="center"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
               prop="materialNumber"
               label="物资件数"
               align="center"
-              width="80px"
+              width="60"
             >
             </el-table-column>
-            <el-table-column label="装货点" width="100">
-              <template slot-scope="scope">
-                <el-select
-                  size="mini"
-                  v-model="scope.row.id"
-                  @change="changePriority(scope.row)"
-                >
-                  <el-option
-                    v-for="item in option"
-                    :key="item.id"
-                    :label="item.value"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
             <el-table-column
               prop="grid"
               label="拼数"
               fit
               align="center"
-              width="80"
+              width="50"
             >
             </el-table-column>
-            <el-table-column prop="driverTel" label="司机电话号码">
+            <el-table-column prop="driverTel" label="司机电话号码" width="120">
             </el-table-column>
             <!-- <el-table-column prop="gatepostName" label="进厂门岗" width="100">
             </el-table-column> -->
-            <el-table-column prop="sureTime" label="可进厂确认时间">
+            <el-table-column prop="sureTime" label="可进厂确认时间" width="150">
             </el-table-column>
-            <el-table-column fixed="right" label="操作" width="180">
+            <el-table-column fixed="right" label="操作" width="150">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -326,90 +355,94 @@
           >
             <el-table-column
               type="selection"
-              width="55"
+              width="45"
+              align="center"
               reserve-selection
               :selectable="selectInitSplleing"
             ></el-table-column>
+            <el-table-column label="装货点" width="120">
+              <template slot-scope="scope">
+                <el-select
+                  size="mini"
+                  v-model="scope.row.id"
+                  @change="changePriority(scope.row)"
+                >
+                  <el-option
+                    v-for="item in option"
+                    :key="item.id"
+                    :label="item.value"
+                    :value="item.id"
+                  >
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
             <el-table-column
               prop="capacityNumber"
               label="车牌号"
               fit
               align="center"
+              width="150"
             >
             </el-table-column>
             <el-table-column
               prop="listNodeOrder"
               label="序号"
-              width="80"
+              width="45"
               align="center"
             ></el-table-column>
             <el-table-column
               prop="resultStartTime"
               label="排队开始时间"
               align="center"
+              width="160"
             >
             </el-table-column>
-            <el-table-column prop="consigneeName" label="客户" fit>
+            <el-table-column prop="consigneeName" label="客户" fit width="180">
             </el-table-column>
             <el-table-column
               prop="materialName"
               label="物资名称"
               align="center"
+              min-width="200"
             >
             </el-table-column>
             <el-table-column
               prop="steelMeter"
               label="钢材长度"
               align="cenetr"
-              width="80"
+              width="60"
             >
             </el-table-column>
             <el-table-column
               prop="materialSpecification"
               label="规格型号"
               align="center"
+              min-width="180"
             >
             </el-table-column>
             <el-table-column
               prop="materialNumber"
               label="物资件数"
               align="center"
-              width="80"
+              width="60"
             >
             </el-table-column>
-            <el-table-column label="装货点" width="100">
-              <template slot-scope="scope">
-                <el-select
-                  size="mini"
-                  v-model="scope.row.id"
-                  @change="changePriority(scope.row)"
-                >
-                  <el-option
-                    v-for="item in option"
-                    :key="item.id"
-                    :label="item.value"
-                    :value="item.id"
-                  >
-                  </el-option>
-                </el-select>
-              </template>
-            </el-table-column>
             <el-table-column
               prop="grid"
               label="拼数"
               fit
-              width="80"
+              width="60"
               align="center"
             >
             </el-table-column>
-            <el-table-column prop="driverTel" label="司机电话号码">
+            <el-table-column prop="driverTel" label="司机电话号码" width="120">
             </el-table-column>
             <!-- <el-table-column prop="gatepostName" label="进厂门岗">
             </el-table-column> -->
-            <el-table-column prop="sureTime" label="可进厂确认时间">
+            <el-table-column prop="sureTime" label="可进厂确认时间" width="150">
             </el-table-column>
-
-            <el-table-column fixed="right" label="操作" width="180">
+            <el-table-column fixed="right" label="操作" width="150">
               <template slot-scope="scope">
                 <el-button
                   type="text"
@@ -623,7 +656,7 @@ export default {
       //单拼的可勾选控制功能在这
       //过滤出处在同一个网格上的数据
       let gridData = this.tableData1.filter(e => {
-        return e.gridId === row.gridId
+        return e.gridId === row.gridId && e.sureTime == null
       })
       //处理下maplist里面的数据
       let reallyMaplist = this.maplist.map(e => {

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

@@ -150,10 +150,12 @@
         </el-table-column>
         <el-table-column
           prop="saleOrderStatus"
+          column-key="saleOrderStatus"
           label="销售订单状态"
-          width="100px"
+          width="110px"
           align="center"
-          show-overflow-tooltip
+          :filters="filterSaleOrderStatus"
+          sortable
         >
         </el-table-column>
         <el-table-column
@@ -242,6 +244,20 @@
           :filters="filterorderStatus"
         >
         </el-table-column>
+        <el-table-column
+          prop="queueStartTime"
+          label="排队开始时间"
+          width="130px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <el-table-column
+          prop="allowEnfactoryTime"
+          label="钢材科放行时间"
+          width="130px"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="entryGateTime"
           label="进厂时间"
@@ -307,7 +323,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="receiptTime" label="抵达时间" width="150px">
+        <el-table-column prop="arrivalTime" label="抵达时间" width="150px">
         </el-table-column>
         <el-table-column
           prop="receiptAddress"
@@ -316,7 +332,7 @@
           show-overflow-tooltip
         >
         </el-table-column>
-        <el-table-column prop="arrivalTime" label="签收时间" width="150px">
+        <el-table-column prop="receiptTime" label="签收时间" width="150px">
         </el-table-column>
         <el-table-column prop="priceValue" label="系统建议运价" width="100px">
         </el-table-column>
@@ -379,6 +395,7 @@
         height="80%"
         v-model="isShow3"
         show-footer
+        show-zoom
         class="vxeModal"
       >
         <div class="demo-image__preview" v-for="(item, i) in srcList" :key="i">
@@ -394,7 +411,7 @@
           </el-image>
         </div>
       </vxe-modal>
-      <vxe-modal width="80%" height="80%" v-model="isShow4">
+      <vxe-modal width="80%" height="80%" v-model="isShow4" show-zoom>
         <div class="demo-image__preview" v-for="(item, i) in srcList2" :key="i">
           <el-image
             :src="item.src"
@@ -683,11 +700,11 @@
                 />
                 <button
                   type="primary"
-                  @click="scope.row.materialNum--"
+                  @click="scope.row.materialNum++"
                   style="height:40px"
                   v-if="!notRoutList.includes('materialNum')"
                 >
-                  -
+                  +
                 </button>
                 <el-button
                   type="primary"
@@ -761,6 +778,7 @@
             width="549px"
             height="731px"
             v-model="isShow"
+            show-zoom
             show-footer
             class="vxeModal"
             title="抵达上传照片"
@@ -787,6 +805,7 @@
             width="549px"
             height="731px"
             v-model="isShow2"
+            show-zoom
             show-footer
             title="签收上传照片"
           >
@@ -1246,6 +1265,7 @@ export default {
       filterorderStatus: [],
       filteraddressPlace: [],
       filtermaterialSpe: [],
+      filterSaleOrderStatus: [],
       filterMap: {},
       //权限控制
       notRoutList: [],
@@ -1720,6 +1740,18 @@ export default {
       ) {
         delete this.filterMap.orderStatusList
       }
+      if (
+        typeof obj.saleOrderStatus != 'undefined' &&
+        obj.saleOrderStatus.length > 0
+      ) {
+        this.filterMap.saleOrderStatusList = obj.saleOrderStatus
+      }
+      if (
+        typeof obj.saleOrderStatus != 'undefined' &&
+        obj.saleOrderStatus.length == 0
+      ) {
+        delete this.filterMap.saleOrderStatusList
+      }
       // if (obj)
       this.onclick(this.filterMap)
     },
@@ -1774,6 +1806,9 @@ export default {
         .filter(e => {
           return e != null
         })
+      let saleOrderStatusList = this.tableData.map(e => {
+        return e.saleOrderStatus
+      })
       this.filterConsigneeList = []
       this.filterCarrierList = []
       this.filterCapacityList = []
@@ -1782,6 +1817,7 @@ export default {
       this.filterorderStatus = []
       this.filteraddressPlace = []
       this.filtermaterialSpe = []
+      this.filterSaleOrderStatus = []
       Array.from(new Set(consigneeNameList)).forEach(e => {
         let map = {}
         map.text = e
@@ -1830,6 +1866,12 @@ export default {
         map.value = e
         this.filtermaterialSpe.push(map)
       })
+      Array.from(new Set(saleOrderStatusList)).forEach(e => {
+        let map = {}
+        map.text = e
+        map.value = e
+        this.filterSaleOrderStatus.push(map)
+      })
     },
     cellStyle({ row, column, rowIndex, columnIndex }) {
       if (
@@ -1991,13 +2033,13 @@ export default {
             this.isShow2 = true
           }
           this.srcList2 = []
-          if(res.data && res.data.length>0){
-            res.data.forEach(item=>{
-                this.srcList2.push({
-                title:"",
-                src:item
-              });
-            });
+          if (res.data && res.data.length > 0) {
+            res.data.forEach(item => {
+              this.srcList2.push({
+                title: '',
+                src: item
+              })
+            })
           }
         })
     },

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

@@ -601,7 +601,7 @@ export default {
         Array.from(rows).forEach(e => {
           let map = {}
           Object.keys(e).forEach(e1 => {
-            if (e1.includes('金蝶分录ID')) {
+            if (e1.includes('分录ID')) {
               map.entryId = e[e1]
               arr.push(map)
             }
@@ -643,7 +643,8 @@ export default {
           let closeEntryList = []
           this.$refs.tableRef.selection.forEach(e => {
             let map = {}
-            e.saleRemark = this.remarkDateNew + e.saleRemark.split[1]
+            e.saleRemark =
+              this.remarkDateNew + e.saleRemark.split(this.remarkDateOld)[1]
             map.saleMaterialId = e.saleMaterialId
             map.closeEntryId = e.closeEntryId
             map.number = e.saleOrderNo
@@ -691,7 +692,9 @@ export default {
                       loading.close()
                       this.$message({
                         type: 'success',
-                        offset: '250'
+                        offset: '250',
+                        message: '生成订单成功,关闭分录成功',
+                        duration: 2000
                       })
                     }
                   })
@@ -716,13 +719,13 @@ export default {
       return `${month}.${day}`
     },
     getRemarkDateOld() {
-      let day = new Date().getDate()
+      let day = new Date().getDate() - 1
       let month = new Date().getMonth() + 1
       console.log(day)
       if (day < 10) {
         day = '0' + day
       }
-      return `${month}.${day - 1}`
+      return `${month}.${day}`
     },
     //继续装
     //筛选