11321

public/index.html

@@ -8,7 +8,7 @@
     <title>平面库监控平台</title>
     <script>
       window._CONFIG = {};
-      window._CONFIG['domianURL'] = 'http://192.168.3.130:10028/LTK';
+      window._CONFIG['domianURL'] = 'http://192.168.3.130:10029';
       window._CONFIG['refreshTime'] = 1000 * 60;
       window._CONFIG['isLTK'] = true
     </script>

src/views/BottomCharts.vue

@@ -43,7 +43,7 @@ export default {
   },
   data () {
     return {
-      url: '/first/getGoodsByToday',
+      url: '/firstDynamic/searchStoreByToday',
       getGoodsByAisle: '/big/getGoodsByAisle'
     }
   },
@@ -56,7 +56,7 @@ export default {
   methods: {
     getData() {
       let params = window._CONFIG['isLTK'] ? {storeCode: this.$route.query.storeCode} : ''
-      getAction(window._CONFIG['domianURL'] + this.url, params).then(res => {
+      getAction(window._CONFIG['domianURL'] + this.url, {storeCode: this.$route.query.storeCode, datetime: new Date().getFullYear() + '-' + (new Date().getMonth() + 1).toString().padStart(2, '0') }).then(res => {
         this.$refs.bll.draw(res.data)
       })
       getAction(window._CONFIG['domianURL'] + this.getGoodsByAisle, params).then(res => {

src/views/bottomLeft.vue

@@ -6,7 +6,7 @@
           <icon name="chart-bar"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2 headerTitle">出库计划列表</span>
+          <span class="fs-xl text mx-2 headerTitle">发物计划列表</span>
         </div>
       </div>
       <dv-scroll-board :config="config" style="width: 5.1rem;height: 4.44rem;margin-top: 10px;" />
@@ -19,7 +19,7 @@ import { postAction } from '@/api/manage'
 export default {
   data() {
     return {
-      url: '/bill/getOutPage',
+      url: '/bill/query',
       config: {}
     };
   },
@@ -31,32 +31,37 @@ export default {
   },
   methods: {
     getOutPage() {
-      let data = window._CONFIG['isLTK'] ? { pageNo: 1, pageSize: 20, condition: {}, storeCode: this.$route.query.storeCode} : { pageNo: 1, pageSize: 20, condition: {} }
-      postAction(window._CONFIG['domianURL'] + this.url, data).then(res => {
+      postAction(window._CONFIG['domianURL'] + this.url, { pageNo: 1, pageSize: 20, condition: {
+        storeCode: this.$route.query.storeCode,
+        type: 'OUT'
+      }}).then(res => {
         let arr = []
         res.data.records.forEach(element => {
           var itemArr = []
           itemArr.push(element.name)
+          itemArr.push(element.deptName)
+          itemArr.push(element.storeName)
           itemArr.push(element.amount)
-          itemArr.push(element.swOrgName)
-          itemArr.push(element.percentage)
-          if (element.stateName === '待执行') {
-            itemArr.push("<span class='colorRed'>" + element.stateName + "</span>")
+          if (element.state === 'T') {
+            itemArr.push("<span class='colorRed'>" + "待执行" + "</span>")
           }
-          if (element.stateName === '进行中') {
-            itemArr.push("<span class='colorGrass'>" + element.stateName + "</span>")
+          if (element.state === 'W') {
+            itemArr.push("<span class='colorRed'>" + "进行中" + "</span>")
+          }
+          if (element.state === 'D') {
+            itemArr.push("<span class='colorGrass'>" + "已完成" + "</span>")
           }
           arr.push(itemArr)
         })
         this.config = {
-          header: ["凭证字", "计划数量", "收物单位", "完成情况", "任务状态"],
+          header: ["凭证字", "发物单位", "库房名", "数量", "任务状态"],
           data: arr,
           rowNum: 7, //表格行数
           headerHeight: 35,
           headerBGC: "#0C2869", //表头
           oddRowBGC: "rgb(15,47,130, 0.5)", //奇数行
           evenRowBGC: "rgb(5,19,104, 0.5)", //偶数行
-          columnWidth: [110, 100, 100, 100, 100, 100, 100],
+          columnWidth: [120, 150,150, 100, 150],
           align: ["center"]
         }
       }) 

src/views/centerLeft1.vue

@@ -6,7 +6,7 @@
           <icon name="chart-line"></icon>
         </span>
         <div class="d-flex">
-          <span class="fs-xl text mx-2 headerTitle">入库计划列表</span>
+          <span class="fs-xl text mx-2 headerTitle">收物计划列表</span>
         </div>
       </div>
       <dv-scroll-board :config="config" style="width: 5.1rem;height: 4.44rem;margin-top: 10px;" />
@@ -20,7 +20,7 @@ import { postAction } from '@/api/manage'
 export default {
   data() {
     return {
-      url: '/bill/getInPage',
+      url: '/bill/query',
       config: {}
     };
   },
@@ -32,32 +32,37 @@ export default {
   },
   methods: {
     getInPage() {
-      let data = window._CONFIG['isLTK'] ? { pageNo: 1, pageSize: 20, condition: {}, storeCode: this.$route.query.storeCode} : { pageNo: 1, pageSize: 20, condition: {} }
-      postAction(window._CONFIG['domianURL'] + this.url, data).then(res => {
+      postAction(window._CONFIG['domianURL'] + this.url, { pageNo: 1, pageSize: 20, condition: {
+        storeCode: this.$route.query.storeCode,
+        type: 'IN'
+      }}).then(res => {
         let arr = []
         res.data.records.forEach(element => {
           var itemArr = []
           itemArr.push(element.name)
+          itemArr.push(element.deptName)
+          itemArr.push(element.storeName)
           itemArr.push(element.amount)
-          itemArr.push(element.fwOrgName)
-          itemArr.push(element.percentage)
-          if (element.stateName === '待执行') {
-            itemArr.push("<span class='colorRed'>" + element.stateName + "</span>")
+          if (element.state === 'T') {
+            itemArr.push("<span class='colorRed'>" + "待执行" + "</span>")
           }
-          if (element.stateName === '进行中') {
-            itemArr.push("<span class='colorGrass'>" + element.stateName + "</span>")
+          if (element.state === 'W') {
+            itemArr.push("<span class='colorRed'>" + "进行中" + "</span>")
+          }
+          if (element.state === 'D') {
+            itemArr.push("<span class='colorGrass'>" + "已完成" + "</span>")
           }
           arr.push(itemArr)
         })
         this.config = {
-          header: ["凭证字", "计划数量", "发物单位", "完成情况", "任务状态"],
+          header: ["凭证字", "发物单位", "库房名", "数量", "任务状态"],
           data: arr,
           rowNum: 7, //表格行数
           headerHeight: 35,
           headerBGC: "#0C2869", //表头
           oddRowBGC: "rgb(15,47,130, 0.5)", //奇数行
           evenRowBGC: "rgb(5,19,104, 0.5)", //偶数行
-          columnWidth: [110, 100, 100, 100, 100, 100, 100],
+          columnWidth: [120, 150,150, 100, 150],
           align: ["center"]
         }
       })