除了RFId的全好了

src/views/InTask.vue

@@ -3,7 +3,10 @@
     <el-col :span="16">
       <el-card style="height: 45vh;">
         <template #header>
-          <span>计划任务</span>
+          <div class="card-header">
+            <span>计划任务</span>
+            <el-button class="button" type="primary" @click="syncInBill" :loading="loading">入库单接收</el-button>
+          </div>
         </template>
         <el-table :data="billList" ref="bill" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="billClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
@@ -25,7 +28,8 @@
           </el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
-            <el-button type="success" size="small" @click="activateBill(scope.row)">激活</el-button> 
+            <el-button type="success" size="small" @click="activateBill(scope.row)" v-if="scope.row.activeState == 0" :disabled="lockState">激活</el-button> 
+            <el-button type="warning" size="small" @click="deactivate(scope.row)" v-if="scope.row.activeState == 1">取消</el-button> 
             <el-button type="primary" size="small" :disabled="scope.row.activeState !== 2" @click="reportBill(scope.row)">上报</el-button>
           </template>
         </el-table-column>
@@ -112,16 +116,18 @@ export default defineComponent({
       const selectBill = ref({})
       const selectGoods = ref({})
       const editable = ref(false)
+      const loading = ref(false)
+      const lockState = ref(false)
       const writeAmount = ref()
       const itemForm = ref({})
       const { proxy } = getCurrentInstance()
       const searchData = ref({
         pageNo: 1,
-        pageSize: 10
+        pageSize: 5
       })
       const searchData1 = ref({
         pageNo: 1,
-        pageSize: 10
+        pageSize: 5
       })
       const searchData2 = ref({
         pageNo: 1,
@@ -137,7 +143,8 @@ export default defineComponent({
           getModelPage: '/bill/getModelPage',
           updateItem: '/bill/updateItem',
           reportBill: '/platform/reportInBill',
-          activateBill: '/bill/activateBill'
+          activateBill: '/bill/activateBill',
+          syncInBill: '/platform/syncInBill'
         },
         storeInfo: {},
         storeCode: ''
@@ -158,7 +165,7 @@ export default defineComponent({
         loadModel()
       }
       
-      const loadData = () => {
+      const loadData = (arg) => {
         if (sessionStorage.getItem('storeInfo')) {
           searchData.value.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode
           searchData.value.type = 'IN'
@@ -166,16 +173,26 @@ export default defineComponent({
             if (res.code !== 99200) return ElMessage.error(res.message);
             billList.value = res.data.records
             total.value = res.data.totalRows - 0
+            goodsList.value = []
+            modelList.value = []
             if (res.data.records.length > 0) {
-              proxy.$refs.bill.setCurrentRow(billList.value[0])
-              selectBill.value = res.data.records[0]
-              loadGoods()
+              // 保证在获取到的单据里面只有一条单据是激活中的  
+              res.data.records.find(i => i.activeState == 1) ? lockState.value = true : lockState.value = false
+              if (arg) {
+                proxy.$refs.bill.setCurrentRow(billList.value.find(i => i.billNo == selectBill.value.billNo))
+                loadGoods(1)
+              } else {
+                proxy.$refs.bill.setCurrentRow(billList.value[0])
+                selectBill.value = res.data.records[0]
+                loadGoods()
+              }
+              
             }
           })
         }
       }
 
-      function loadGoods() {
+      function loadGoods(arg) {
         searchData1.value.storeCode = searchData.value.storeCode
         searchData1.value.bizBillNo = selectBill.value.bizBillNo
         postAction(state.url.getGoodsPage, searchData1.value).then(res => {
@@ -183,8 +200,12 @@ export default defineComponent({
           goodsList.value = res.data.records
           total1.value = res.data.totalRows - 0
           if (res.data.records.length > 0) {
-            proxy.$refs.goods.setCurrentRow(goodsList.value[0])
-            selectGoods.value = res.data.records[0]
+            if (arg) {
+              proxy.$refs.goods.setCurrentRow(goodsList.value.find(i => i.goodsCode == selectGoods.value.goodsCode))
+            } else {
+              proxy.$refs.goods.setCurrentRow(goodsList.value[0])
+              selectGoods.value = res.data.records[0]
+            }
             loadModel()
           }
         })
@@ -225,7 +246,8 @@ export default defineComponent({
         writeAmount.value = e
         itemForm.value.writeAmount = e
       }
-
+      
+      // 手动修改数量
       function check() {
         proxy.editable = false;
         itemForm.value.bizBillNo = selectBill.value.bizBillNo
@@ -233,10 +255,11 @@ export default defineComponent({
         postAction(state.url.updateItem, itemForm.value).then(res => {
           if (res.code !== 99200) return ElMessage.error(res.message);
           ElMessage.success(res.message)
-          loadData()
+          loadData(1)
         })
       }
-
+      
+      // 上报单据
       function reportBill(row) {
         getAction(state.url.reportBill, {storeCode: searchData.value.storeCode, billNo: row.billNo}).then(res => {
           if (res.code !== 99200) return ElMessage.error(res.message);
@@ -244,8 +267,47 @@ export default defineComponent({
           loadData()
         })
       }
+      
+      // 激活单据
+      function activateBill(row) {
+        row.activeState = 1
+        postAction(state.url.activateBill, row).then(res => {
+          if (res.code !== 99200) {
+            row.activeState = 0
+            return ElMessage.error(res.message);
+          }
+          ElMessage.success(res.message)
+          searchData.value.pageNo = 1
+          loadData(1)
+        })
+      }
+      
+      // 取消激活
+      function deactivate(row) {
+        row.activeState = 0
+        postAction(state.url.activateBill, row).then(res => {
+          if (res.code !== 99200) {
+            row.activeState = 1
+            return ElMessage.error(res.message);
+          }
+          ElMessage.success(res.message)
+          searchData.value.pageNo = 1
+          loadData(1)
+        })
+      }
+      
+      // 同步单据
+      function syncInBill() {
+        loading.value = true
+        getAction(state.url.syncInBill, {storeCode: searchData.value.storeCode}).then(res => {
+          if (res.code !== 99200) return ElMessage.error(res.message);
+          ElMessage.success(res.message)
+          loading.value = false
+          loadData()
+        })
+      }
 
-      loadData()
+    //   loadData()
       return {
         ...toRefs(state),
         billList,
@@ -262,6 +324,7 @@ export default defineComponent({
         editable,
         writeAmount,
         itemForm,
+        lockState,
         handleCurrentChange,
         handleCurrentChange1,
         handleCurrentChange2,
@@ -271,7 +334,11 @@ export default defineComponent({
         edit,
         check,
         reportBill,
-        loadData
+        loadData,
+        syncInBill,
+        activateBill,
+        deactivate,
+        loading
       }
     },
 })
@@ -286,4 +353,9 @@ export default defineComponent({
     padding: 4px 5px 5px 5px;
     cursor: pointer;
 }
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
\ No newline at end of file

src/views/OutTask.vue

@@ -3,7 +3,10 @@
     <el-col :span="16">
       <el-card style="height: 45vh;">
         <template #header>
-          <span>计划任务</span>
+          <div class="card-header">
+            <span>计划任务</span>
+            <el-button class="button" type="primary" @click="syncOutBill" :loading="loading">出库单接收</el-button>
+          </div>
         </template>
         <el-table :data="billList" ref="bill" border style="width: 100%;height: 31vh;" highlight-current-row @row-click="billClick">
           <el-table-column type="index" label="序号" width="60" align="center"/>
@@ -25,7 +28,8 @@
           </el-table-column>
         <el-table-column label="操作" width="200" align="center">
           <template #default="scope">
-            <el-button type="success" size="small" @click="activateBill(scope.row)">激活</el-button> 
+            <el-button type="success" size="small" @click="activateBill(scope.row)" v-if="scope.row.activeState == 0" :disabled="lockState">激活</el-button> 
+            <el-button type="warning" size="small" @click="deactivate(scope.row)" v-if="scope.row.activeState == 1">取消</el-button> 
             <el-button type="primary" size="small" :disabled="scope.row.activeState !== 2" @click="reportBill(scope.row)">上报</el-button>
           </template>
         </el-table-column>
@@ -103,7 +107,7 @@
 <script>
 import { defineComponent, ref, reactive, toRefs, getCurrentInstance } from 'vue'
 import { ElMessage } from 'element-plus'
-import { postAction } from '@/api/manage'
+import { postAction, getAction } from '@/api/manage'
 export default defineComponent({
     setup() {
       const billList = ref([])
@@ -112,16 +116,18 @@ export default defineComponent({
       const selectBill = ref({})
       const selectGoods = ref({})
       const editable = ref(false)
+      const loading = ref(false)
+      const lockState = ref(false)
       const writeAmount = ref()
       const itemForm = ref({})
       const { proxy } = getCurrentInstance()
       const searchData = ref({
         pageNo: 1,
-        pageSize: 10
+        pageSize: 5
       })
       const searchData1 = ref({
         pageNo: 1,
-        pageSize: 10
+        pageSize: 5
       })
       const searchData2 = ref({
         pageNo: 1,
@@ -137,7 +143,8 @@ export default defineComponent({
           getModelPage: '/bill/getModelPage',
           updateItem: '/bill/updateItem',
           reportBill: '/platform/reportOutBill',
-          activateBill: '/bill/activateBill'
+          activateBill: '/bill/activateBill',
+          syncOutBill: '/platform/syncOutBill'
         },
         storeInfo: {},
         storeCode: ''
@@ -158,7 +165,7 @@ export default defineComponent({
         loadModel()
       }
       
-      const loadData = () => {
+      const loadData = (arg) => {
         if (sessionStorage.getItem('storeInfo')) {
           searchData.value.storeCode = JSON.parse(sessionStorage.getItem('storeInfo')).storeCode
           searchData.value.type = 'OUT'
@@ -166,16 +173,26 @@ export default defineComponent({
             if (res.code !== 99200) return ElMessage.error(res.message);
             billList.value = res.data.records
             total.value = res.data.totalRows - 0
+            goodsList.value = []
+            modelList.value = []
             if (res.data.records.length > 0) {
-              proxy.$refs.bill.setCurrentRow(billList.value[0])
-              selectBill.value = res.data.records[0]
-              loadGoods()
+              // 保证在获取到的单据里面只有一条单据是激活中的  
+              res.data.records.find(i => i.activeState == 1) ? lockState.value = true : lockState.value = false
+              if (arg) {
+                proxy.$refs.bill.setCurrentRow(billList.value.find(i => i.billNo == selectBill.value.billNo))
+                loadGoods(1)
+              } else {
+                proxy.$refs.bill.setCurrentRow(billList.value[0])
+                selectBill.value = res.data.records[0]
+                loadGoods()
+              }
+              
             }
           })
         }
       }
 
-      function loadGoods() {
+      function loadGoods(arg) {
         searchData1.value.storeCode = searchData.value.storeCode
         searchData1.value.bizBillNo = selectBill.value.bizBillNo
         postAction(state.url.getGoodsPage, searchData1.value).then(res => {
@@ -183,8 +200,12 @@ export default defineComponent({
           goodsList.value = res.data.records
           total1.value = res.data.totalRows - 0
           if (res.data.records.length > 0) {
-            proxy.$refs.goods.setCurrentRow(goodsList.value[0])
-            selectGoods.value = res.data.records[0]
+            if (arg) {
+              proxy.$refs.goods.setCurrentRow(goodsList.value.find(i => i.goodsCode == selectGoods.value.goodsCode))
+            } else {
+              proxy.$refs.goods.setCurrentRow(goodsList.value[0])
+              selectGoods.value = res.data.records[0]
+            }
             loadModel()
           }
         })
@@ -225,7 +246,8 @@ export default defineComponent({
         writeAmount.value = e
         itemForm.value.writeAmount = e
       }
-
+      
+      // 手动修改数量
       function check() {
         proxy.editable = false;
         itemForm.value.bizBillNo = selectBill.value.bizBillNo
@@ -233,10 +255,11 @@ export default defineComponent({
         postAction(state.url.updateItem, itemForm.value).then(res => {
           if (res.code !== 99200) return ElMessage.error(res.message);
           ElMessage.success(res.message)
-          loadData()
+          loadData(1)
         })
       }
-
+      
+      // 上报单据
       function reportBill(row) {
         getAction(state.url.reportBill, {storeCode: searchData.value.storeCode, billNo: row.billNo}).then(res => {
           if (res.code !== 99200) return ElMessage.error(res.message);
@@ -244,8 +267,47 @@ export default defineComponent({
           loadData()
         })
       }
+      
+      // 激活单据
+      function activateBill(row) {
+        row.activeState = 1
+        postAction(state.url.activateBill, row).then(res => {
+          if (res.code !== 99200) {
+            row.activeState = 0
+            return ElMessage.error(res.message);
+          }
+          ElMessage.success(res.message)
+          searchData.value.pageNo = 1
+          loadData(1)
+        })
+      }
+      
+      // 取消激活
+      function deactivate(row) {
+        row.activeState = 0
+        postAction(state.url.activateBill, row).then(res => {
+          if (res.code !== 99200) {
+            row.activeState = 1
+            return ElMessage.error(res.message);
+          }
+          ElMessage.success(res.message)
+          searchData.value.pageNo = 1
+          loadData(1)
+        })
+      }
+      
+      // 同步单据
+      function syncOutBill() {
+        loading.value = true
+        getAction(state.url.syncOutBill, {storeCode: searchData.value.storeCode}).then(res => {
+          if (res.code !== 99200) return ElMessage.error(res.message);
+          ElMessage.success(res.message)
+          loading.value = false
+          loadData()
+        })
+      }
 
-      loadData()
+    //   loadData()
       return {
         ...toRefs(state),
         billList,
@@ -262,6 +324,7 @@ export default defineComponent({
         editable,
         writeAmount,
         itemForm,
+        lockState,
         handleCurrentChange,
         handleCurrentChange1,
         handleCurrentChange2,
@@ -271,7 +334,11 @@ export default defineComponent({
         edit,
         check,
         reportBill,
-        loadData
+        loadData,
+        syncOutBill,
+        activateBill,
+        deactivate,
+        loading
       }
     },
 })
@@ -286,4 +353,9 @@ export default defineComponent({
     padding: 4px 5px 5px 5px;
     cursor: pointer;
 }
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
\ No newline at end of file

src/views/Query.vue

@@ -10,7 +10,7 @@
             <el-date-picker v-model="searchData.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%;"/>
           </el-form-item>
           <el-form-item label="出入库">
-            <el-select v-model="searchData.state" placeholder="请选择出入库" style="width: 100%;">
+            <el-select v-model="searchData.type" placeholder="请选择出入库" style="width: 100%;">
               <el-option value="IN" label="入库"></el-option>
               <el-option value="OUT" label="出库"></el-option>
             </el-select>
@@ -27,27 +27,28 @@
     </el-col>
     <el-col :span="18">
       <el-card>
-        <el-table :data="logList" border size="large" style="width: 100%;height: 88vh;">
+        <el-table :data="logList" border size="large" style="width: 100%;height: 85vh;">
           <el-table-column type="index" label="序号" width="70" align="center"/>
           <el-table-column prop="inState" label="出入库" align="center">
             <template #default="scope"> 
-               {{ scope.row.inState == 'IN' ? '入库' : '出库' }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="inBillNo" label="单号" align="center">
-            <template #default="scope"> 
-               {{ scope.row.inBillNo || scope.row.outBillNo }}
+               {{ scope.row.type == 'IN' ? '入库' : '出库' }}
             </template>
           </el-table-column>
+          <el-table-column prop="billName" label="单号" align="center"/>
           <el-table-column prop="goodsName" label="品名" align="center"/>
           <el-table-column prop="modelName" label="号型" align="center"/>
-          <el-table-column prop="qty" label="数量" align="center"/>
-          <el-table-column prop="inTime" label="出入库日期" align="center">
-            <template #default="scope"> 
-               {{ scope.row.inTime || scope.row.outTime }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="amount" label="数量" align="center"/>
+          <el-table-column prop="createTime" label="出入库日期" align="center"/>
         </el-table>
+        <el-pagination
+          style="left: 40%;margin-top: 6px;"
+          background
+          @current-change="handleCurrentChange"
+          :current-page="searchData.pageNo"
+          :page-size="searchData.pageSize"
+          layout="total, prev, pager, next"
+          :total="total"
+        />
       </el-card>
     </el-col>
   </el-row>
@@ -61,14 +62,12 @@ import { postAction } from '@/api/manage'
 export default defineComponent({
     setup() {
       const logList = ref([])
-      const formData = ref({
-        amount: 1
-      })
+      const formData = ref({})
       const { proxy } = getCurrentInstance()
       const searchData = ref({
         pageNo: 1,
         pageSize: 10,
-        state: 'IN',
+        type: 'IN',
         startTime: parseTime(new Date(new Date().setHours(0, 0, 0, 0))),
         endTime: parseTime(new Date())
       })
@@ -95,12 +94,7 @@ export default defineComponent({
 
       const state = reactive({
         url: {
-          getGoodsRecord: '/channel/getGoodsRecord',
-          getBindPage: '/bind/getBindPage',
-          getBillPage: '/bill/getBillPage',
-          getGoodsPage: '/bill/getGoodsPage',
-          getModelPage: '/bill/getModelPage',
-          updateBind: '/bind/updateBind'
+          getGoodsRecord: '/log/getLogPage'
         }
       });
 
@@ -114,19 +108,15 @@ export default defineComponent({
         if (sessionStorage.getItem('storeInfo')) {
           let config = JSON.parse(sessionStorage.getItem('storeInfo'))
           searchData.value.storeCode = config.storeCode
-          postAction('http://' + config.serverIp + ':' + config.serverPort + state.url.getGoodsRecord, searchData.value).then(res => {
+          postAction(state.url.getGoodsRecord, searchData.value).then(res => {
             if (res.code !== 99200) return ElMessage.error(res.message);
-            logList.value = res.data
+            logList.value = res.data.records
+            total.value = res.data.totalRows - 0
           })
         }
       }
 
-
-
-      
-
-
-      loadData()
+    //   loadData()
       return {
         ...toRefs(state),
         logList,

src/views/Setting.vue

@@ -4,7 +4,7 @@
       <el-card>
         <el-form label-position="right" size="large" label-width="100px" :model="formData" style="max-width: 460px;height: 88vh;">
           <el-form-item label="通道">
-            <el-select v-model="formData.stationId" style="width: 100%;" filterable placeholder="请选择通道">
+            <el-select v-model="formData.stationId" style="width: 100%;" filterable placeholder="请选择通道" @change="changeStation">
               <el-option v-for="item in bindList" :key="item.stationId" :label="item.stationId" :value="item.stationId"/>
             </el-select>
           </el-form-item>
@@ -27,8 +27,8 @@
             <el-input-number v-model="formData.amount" :min="0" :precision="0" style="width: 100%;"/>
           </el-form-item>
           <div style="text-align: center;">
-            <el-button type="success" @click="automatic">自动</el-button>
-            <el-button type="primary" @click="manual">手动</el-button>
+            <el-button type="success" @click="automatic" style="width: 45%">自动</el-button>
+            <el-button type="primary" @click="manual" style="width: 45%">手动</el-button>
           </div>
         </el-form>
       </el-card>
@@ -117,13 +117,19 @@ export default defineComponent({
         })
       }
 
+      function changeStation(value) {
+        if(value) {
+          formData.value.id = bindList.value.find(i => i.stationId == formData.value.stationId).id
+          console.log(formData.value.id)
+        }
+      }
+
       function changeBill(value) {
         goodsList.value = []
         formData.value.goodsCode = ''
         modelList.value = []
         formData.value.modelCode = ''
         if (value) {
-          formData.value.id = bindList.value.find(i => i.stationId == formData.value.stationId).id
           formData.value.bizBillNo = billList.value.find(i => i.billNo == formData.value.billNo).bizBillNo
           formData.value.billName = billList.value.find(i => i.billNo == formData.value.billNo).billName
           postAction(state.url.getGoodsPage, {pageNo: 1, pageSize: 50, type: 'IN', storeCode: JSON.parse(sessionStorage.getItem('storeInfo')).storeCode, bizBillNo: formData.value.bizBillNo}).then(res => {
@@ -182,7 +188,7 @@ export default defineComponent({
       }
 
 
-      loadData()
+    //   loadData()
       loadSelect()
       return {
         ...toRefs(state),
@@ -195,6 +201,7 @@ export default defineComponent({
         searchData,
         total, 
         handleCurrentChange,
+        changeStation,
         changeBill,
         changeGoods,
         changeModel,