更新

2023-03-24 08:26:20 +08:00
parent bf7a53a9e3
commit ac4878cfeb
14 changed files with 7393 additions and 7587 deletions
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -49,7 +49,7 @@ module.exports = {
      {
        test: /\.js$/,
        loader: 'babel-loader',
-        include: [resolve('src'), resolve('test')]
+        include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')]
      },
      {
        test: /\.svg$/,
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -34,7 +34,7 @@
     // 2. iframeUrl: 是否通过iframe嵌套展示内容, '以http[s]://开头': 是, '': 否
     // 提示: 如需要通过iframe嵌套展示内容, 但不通过tab打开, 请自行创建组件使用iframe处理!
     { path: '/home', component: _import('common/home'), name: 'home', meta: { title: '首页' } },
-     { path: '/schedule', component: _import('modules/job/schedule'), name: 'schedule', meta: { title: '定时任务' } },
+    //  { path: '/schedule', component: _import('modules/job/schedule'), name: 'schedule', meta: { title: '定时任务' } },
     { path: '/theme', component: _import('common/theme'), name: 'theme', meta: { title: '主题' } },
     { path: '/instock', component: _import('modules/work/instock'), name: 'instock', meta: { title: '扫码入库' } },
     { path: '/demo-echarts', component: _import('demo/echarts'), name: 'demo-echarts', meta: { title: 'demo-echarts', isTab: true } },
@@ -47,7 +47,7 @@
     { path: '/mtproduct', component: _import('modules/work/mtproduct'), name: 'mtproduct', meta: { title: '产品基础信息', isTab: true } },
     { path: '/mtsysdictdata', component: _import('modules/work/mtsysdictdata'), name: 'mtsysdictdata', meta: { title: '数据字典', isTab: true } },
     { path: '/mtsysdicttype', component: _import('modules/work/mtsysdicttype'), name: 'mtsysdicttype', meta: { title: '数据字典类型', isTab: true } },
-     { path: '/mttaskinfo', component: _import('modules/work/mttaskinfo'), name: 'mttaskinfo', meta: { title: '出入库任务日志', isTab: true } },
+     { path: '/mttaskinfo', component: _import('modules/work/mttaskinfo'), name: 'mttaskinfo', meta: { title: '出入库任务', isTab: true } },
     { path: '/mttaskinfodet', component: _import('modules/work/mttaskinfodet'), name: 'mttaskinfodet', meta: { title: 'mttaskinfodet', isTab: false } },
     { path: '/mttaskinfodetlog', component: _import('modules/work/mttaskinfodetlog'), name: 'mttaskinfodetlog', meta: { title: 'mttaskinfodetlog', isTab: true } },
     { path: '/mttaskinfolog', component: _import('modules/work/mttaskinfolog'), name: 'mttaskinfolog', meta: { title: '出入库任务日志', isTab: true } },
@@ -56,7 +56,7 @@
     { path: '/mtwarehouspositionrelatlog', component: _import('modules/work/mtwarehouspositionrelatlog'), name: 'mtwarehouspositionrelatlog', meta: { title: '库位使用详情日志', isTab: true } },
     { path: '/mtwarehousrank', component: _import('modules/work/mtwarehousrank'), name: 'mtwarehousrank', meta: { title: '库位基础信息', isTab: true } },
     { path: '/mtwarehousregion', component: _import('modules/work/mtwarehousregion'), name: 'mtwarehousregion', meta: { title: '仓库区域基础信息', isTab: true } },
-     { path: '/OperationMonitor', component: _import('modules/work/OperationMonitor'), name: 'OperationMonitor', meta: { title: '运行监控', isTab: true } }
+     { path: '/OperationMonitor', component: _import('modules/work/OperationMonitor'), name: 'OperationMonitor', meta: { title: '仓库监控', isTab: true } }
   ],
   beforeEnter (to, from, next) {
     let token = Vue.cookie.get('token')
--- a/src/views/common/home.vue
+++ b/src/views/common/home.vue
@@ -15,7 +15,7 @@
        <el-card :style="{height: boxHeight + 'px'}" class="box-card box-card-ck" shadow="hover" @click.native="$router.push({ name: 'mtwarehouspositionrelat' })">
          <p class="box-card-header">
            <icon-svg class="iconClass" name="出库"></icon-svg>
-            库位
+            库存
          </p>
          <p class="box-card-footer">Warehouse</p>
        </el-card>
@@ -52,12 +52,12 @@
        align="center"
        label="添加时间">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="userName"
        header-align="center"
        align="center"
        label="操作员名称">
-      </el-table-column>
+      </el-table-column> -->
      <!-- <el-table-column
        prop="source"
        header-align="center"
@@ -94,12 +94,12 @@
        align="center"
        label="产品编码">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="specModel"
        header-align="center"
        align="center"
        label="具体型号">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="num"
        header-align="center"
--- a/src/views/main-sidebar.vue
+++ b/src/views/main-sidebar.vue
@@ -10,14 +10,14 @@
          <icon-svg name="shouye" class="site-sidebar__menu-icon"></icon-svg>
          <span slot="title">首页</span>
        </el-menu-item>
-        <el-menu-item index="schedule" @click="$router.push({ name: 'schedule' })">
+        <!-- <el-menu-item index="schedule" @click="$router.push({ name: 'schedule' })">
          <icon-svg name="job" class="site-sidebar__menu-icon"></icon-svg>
          <span slot="title">定时任务</span>
-        </el-menu-item>
+        </el-menu-item> -->

        <el-menu-item index="OperationMonitor" @click="$router.push({ name: 'OperationMonitor' })">
          <icon-svg name="zaijiagong" class="site-sidebar__menu-icon"></icon-svg>
-          <span slot="title">运行监控</span>
+          <span slot="title">仓库监控</span>
        </el-menu-item>

        <el-menu-item index="instock" @click="$router.push({ name: 'instock' })">
--- a/src/views/modules/work/OperationMonitor.vue
+++ b/src/views/modules/work/OperationMonitor.vue
@@ -2,11 +2,14 @@
 * @Author: zwq
 * @Date: 2022-05-31 15:49:03
 * @LastEditors: zwq
- * @LastEditTime: 2022-11-22 14:41:50
+ * @LastEditTime: 2023-03-10 11:33:12
 * @Description:
 -->
 <template>
  <div>
+    <el-tabs @tab-click="handleClick" style="margin-top:-30px">
+      <el-tab-pane label="A库"></el-tab-pane>
+      <el-tab-pane label="B库"></el-tab-pane>
    <div
      style="width:100%;height:100%;border-bottom:1px dotted #ff0000;padding-bottom:10px"
    >
@@ -18,47 +21,58 @@
        </el-col>
      </el-row>
    </div>
-    <div class="wareBody">
-      <div
-        v-for="(item, index) in shelfArr"
-        :key="index"
-        class="shelfBox"
-        ref="shelfBox"
-        v-bind:class="[
-          item.taskType === 0 ? 'deliveryShelfBox' : 'normalShelfBox'
-        ]"
-      >
-        <el-popover trigger="hover" word-wrap placement="top-start">
-          <label style="margin-left:20px">货位信息</label>
-          <br />
-          <label>操作台号：{{ item.name }}</label>
-          <div slot="reference">
-            <label>{{ item.name }}</label>
-          </div>
-        </el-popover>
+      <div class="wareBody">
+        <div
+          v-for="(item, index) in shelfArr.filter(item => {
+            return item.direction === '1';
+          })"
+          :key="index"
+          class="shelfBox"
+          ref="shelfBox"
+          v-bind:class="[
+            item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
+          ]"
+          @click="getInfo(item.id, item.isOccupy)"
+        >
+          <el-popover trigger="click" word-wrap placement="top-start">
+            <label>{{ item.anotherName }}</label
+            ><br />
+            <label>编码:{{ shelfInfo.productCode }}</label
+            ><br />
+            <label>数量:{{ shelfInfo.quantity }}</label>
+            <div slot="reference">
+              <span>{{ item.anotherName }}</span>
+            </div>
+          </el-popover>
+        </div>
      </div>
-    </div>
-    <div class="line">分隔线</div>
-    <div class="wareBody">
-      <div
-        v-for="(item, index) in shelfArr"
-        :key="index"
-        class="shelfBox"
-        ref="shelfBox"
-        v-bind:class="[
-          item.taskType === 0 ? 'deliveryShelfBox' : 'normalShelfBox'
-        ]"
-      >
-        <el-popover trigger="hover" word-wrap placement="top-start">
-          <label style="margin-left:20px">货位信息</label>
-          <br />
-          <label>操作台号：{{ item.name }}</label>
-          <div slot="reference">
-            <label>{{ item.name }}</label>
-          </div>
-        </el-popover>
+      <div class="line">-- --</div>
+      <div class="wareBody">
+        <div
+          v-for="(item, index) in shelfArr.filter(item => {
+            return item.direction === '-1';
+          })"
+          :key="index"
+          class="shelfBox"
+          ref="shelfBox"
+          v-bind:class="[
+            item.isOccupy === 0 ? 'normalShelfBox' : 'deliveryShelfBox'
+          ]"
+          @click="getInfo(item.id, item.isOccupy)"
+        >
+          <el-popover trigger="click" word-wrap placement="top-start">
+            <label>{{ item.anotherName }}</label
+            ><br />
+            <label>编码:{{ shelfInfo.productCode }}</label
+            ><br />
+            <label>数量:{{ shelfInfo.quantity }}</label>
+            <div slot="reference">
+              <span>{{ item.anotherName }}</span>
+            </div>
+          </el-popover>
+        </div>
      </div>
-    </div>
+    </el-tabs>
  </div>
 </template>

@@ -66,298 +80,10 @@
 export default {
  data () {
    return {
-      shelfArr: [
-        {
-          name: 1,
-          taskType: 0
-        },
-        {
-          name: 2,
-          taskType: 1
-        },
-        {
-          name: 3,
-          taskType: 0
-        },
-        {
-          name: 4,
-          taskType: 0
-        },
-        {
-          name: 5,
-          taskType: 1
-        },
-        {
-          name: 6,
-          taskType: 0
-        },
-        {
-          name: 7,
-          taskType: 0
-        },
-        {
-          name: 8,
-          taskType: 1
-        },
-        {
-          name: 9,
-          taskType: 0
-        },
-        {
-          name: 10,
-          taskType: 0
-        },
-        {
-          name: 11,
-          taskType: 1
-        },
-        {
-          name: 12,
-          taskType: 0
-        },
-        {
-          name: 13,
-          taskType: 0
-        },
-        {
-          name: 14,
-          taskType: 1
-        },
-        {
-          name: 15,
-          taskType: 0
-        },
-        {
-          name: 16,
-          taskType: 0
-        },
-        {
-          name: 17,
-          taskType: 1
-        },
-        {
-          name: 18,
-          taskType: 0
-        },
-        {
-          name: 1,
-          taskType: 0
-        },
-        {
-          name: 2,
-          taskType: 1
-        },
-        {
-          name: 3,
-          taskType: 0
-        },
-        {
-          name: 4,
-          taskType: 0
-        },
-        {
-          name: 5,
-          taskType: 1
-        },
-        {
-          name: 6,
-          taskType: 0
-        },
-        {
-          name: 7,
-          taskType: 0
-        },
-        {
-          name: 8,
-          taskType: 1
-        },
-        {
-          name: 9,
-          taskType: 0
-        },
-        {
-          name: 10,
-          taskType: 0
-        },
-        {
-          name: 11,
-          taskType: 1
-        },
-        {
-          name: 12,
-          taskType: 0
-        },
-        {
-          name: 13,
-          taskType: 0
-        },
-        {
-          name: 14,
-          taskType: 1
-        },
-        {
-          name: 15,
-          taskType: 0
-        },
-        {
-          name: 16,
-          taskType: 0
-        },
-        {
-          name: 17,
-          taskType: 1
-        },
-        {
-          name: 18,
-          taskType: 0
-        },
-        {
-          name: 1,
-          taskType: 0
-        },
-        {
-          name: 2,
-          taskType: 1
-        },
-        {
-          name: 3,
-          taskType: 0
-        },
-        {
-          name: 4,
-          taskType: 0
-        },
-        {
-          name: 5,
-          taskType: 1
-        },
-        {
-          name: 6,
-          taskType: 0
-        },
-        {
-          name: 7,
-          taskType: 0
-        },
-        {
-          name: 8,
-          taskType: 1
-        },
-        {
-          name: 9,
-          taskType: 0
-        },
-        {
-          name: 10,
-          taskType: 0
-        },
-        {
-          name: 11,
-          taskType: 1
-        },
-        {
-          name: 12,
-          taskType: 0
-        },
-        {
-          name: 13,
-          taskType: 0
-        },
-        {
-          name: 14,
-          taskType: 1
-        },
-        {
-          name: 15,
-          taskType: 0
-        },
-        {
-          name: 16,
-          taskType: 0
-        },
-        {
-          name: 17,
-          taskType: 1
-        },
-        {
-          name: 18,
-          taskType: 0
-        },
-        {
-          name: 1,
-          taskType: 0
-        },
-        {
-          name: 2,
-          taskType: 1
-        },
-        {
-          name: 3,
-          taskType: 0
-        },
-        {
-          name: 4,
-          taskType: 0
-        },
-        {
-          name: 5,
-          taskType: 1
-        },
-        {
-          name: 6,
-          taskType: 0
-        },
-        {
-          name: 7,
-          taskType: 0
-        },
-        {
-          name: 8,
-          taskType: 1
-        },
-        {
-          name: 9,
-          taskType: 0
-        },
-        {
-          name: 10,
-          taskType: 0
-        },
-        {
-          name: 11,
-          taskType: 1
-        },
-        {
-          name: 12,
-          taskType: 0
-        },
-        {
-          name: 13,
-          taskType: 0
-        },
-        {
-          name: 14,
-          taskType: 1
-        },
-        {
-          name: 15,
-          taskType: 0
-        },
-        {
-          name: 16,
-          taskType: 0
-        },
-        {
-          name: 17,
-          taskType: 1
-        },
-        {
-          name: 18,
-          taskType: 0
-        }
-      ],
+      shelfArr: [],
      car: '',
-      zhigui: ''
+      zhigui: '',
+      shelfInfo: {}
    }
  },
  created () {},
@@ -369,6 +95,48 @@ export default {
      this.car = document.getElementById('car')
      this.zhigui = document.getElementById('zhigui')
      this.runCar()
+      this.getList('A')
+    },
+    getList (name) {
+      this.$http({
+        url: this.$http.adornUrl('/work/mtwarehouspositionrelat/getRankList'),
+        method: 'post',
+        data: name
+      }).then(({ data }) => {
+        if (data) {
+          this.shelfArr = data
+        } else {
+          this.$message.error(data.msg)
+        }
+      })
+    },
+    getInfo (id, isOccupy) {
+      if (isOccupy) {
+        this.$http({
+          url: this.$http.adornUrl(
+            '/work/mtwarehouspositionrelat/getRankInfoById'
+          ),
+          method: 'post',
+          data: id
+        }).then(({ data }) => {
+          if (data) {
+            this.shelfInfo = data
+          } else {
+            this.shelfInfo = {}
+            this.$message.error(data.msg)
+          }
+        })
+      } else {
+        this.shelfInfo = {}
+        this.$message.error('该位置无货')
+      }
+    },
+    handleClick (tab) {
+      if (tab.index === '0') {
+        this.getList('A')
+      } else {
+        this.getList('B')
+      }
    },
    runCar () {
      const runCarInterval = setInterval(() => {
@@ -382,7 +150,12 @@ export default {
    backCar () {
      const backCarInterval = setInterval(() => {
        this.car.style.left = this.car.offsetLeft + 1 + 'px'
-        if (this.zhigui.clientWidth - this.car.offsetLeft - this.car.offsetWidth <= 0) {
+        if (
+          this.zhigui.clientWidth -
+            this.car.offsetLeft -
+            this.car.offsetWidth <=
+          0
+        ) {
          clearInterval(backCarInterval)
          this.runCar()
        }
@@ -412,22 +185,23 @@ export default {
  flex-wrap: wrap;
  min-width: 1200px;
  position: relative;
-  padding: 20px;
+  padding: 15px;
 }
 .shelfBox {
  width: 5.5%;
-  height: 50px;
-  padding: 20px;
+  height: 55px;
+  padding: 5px 8px;
  border: 2px solid #cdcdc5;
  border-radius: 5px;
-  line-height: 10px;
+  line-height: 18px;
  text-align: center;
  color: white;
  overflow: hidden;
  position: relative;
+  cursor: pointer;
 }
 .deliveryShelfBox {
-  background-color: rgb(245, 72, 72);
+  background-color: #e2a448;
 }

 .normalShelfBox {
@@ -443,8 +217,8 @@ export default {
  position: absolute;
 }
 .line {
-  padding: 0 20px 0;
-  margin: 20px auto;
+  padding: 0 5px 0;
+  margin: 8px auto;
  line-height: 3px;
  border-left: 500px solid rgb(137, 139, 131);
  border-right: 500px solid rgb(137, 139, 131);
--- a/src/views/modules/work/mtcommunlog.vue
+++ b/src/views/modules/work/mtcommunlog.vue
@@ -29,12 +29,6 @@
        align="center"
        label="添加时间">
      </el-table-column>
-      <el-table-column
-        prop="updateTime"
-        header-align="center"
-        align="center"
-        label="修改时间">
-      </el-table-column>
      <el-table-column
        prop="status"
        header-align="center"
--- a/src/views/modules/work/mttaskinfo-add-or-update.vue
+++ b/src/views/modules/work/mttaskinfo-add-or-update.vue
@@ -46,6 +46,7 @@
        <el-select
          clearable
          filterable
+          :disabled="!dataForm.regionId"
          v-model="dataForm.startPosition"
          placeholder="请选择起点"
        >
@@ -180,33 +181,41 @@ export default {
            this.productArr = []
          }
        })
-        this.$http({
-          url: this.$http.adornUrl('/work/mtwarehousrank/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            page: 1,
-            limit: 500,
-            key: ''
-          })
-        }).then(({ data }) => {
-          if (data && data.code === 0) {
-            this.startPositionArr = data.page.list.splice(
-              0,
-              data.page.list.length - 4
-            )
-          } else {
-            this.startPositionArr = []
-          }
-        })
      })
    },
    warehouseC () {
      if (this.dataForm.warehouseName === 'A') {
        this.dataForm.endPosition = 290
-      } else {
+        this.dataForm.regionId = 1
+        this.getStartPoint()
+      } else if (this.dataForm.warehouseName === 'B') {
        this.dataForm.endPosition = 292
+        this.dataForm.regionId = 2
+        this.getStartPoint()
+      } else {
+        this.dataForm.endPosition = null
+        this.dataForm.regionId = 0
      }
    },
+    getStartPoint () {
+      this.$http({
+        url: this.$http.adornUrl('/work/mtwarehousrank/list'),
+        method: 'get',
+        params: this.$http.adornParams({
+          page: 1,
+          limit: 500,
+          isOccupy: 1,
+          regionId: this.dataForm.regionId,
+          key: ''
+        })
+      }).then(({ data }) => {
+        if (data && data.code === 0) {
+          this.startPositionArr = data.page.list
+        } else {
+          this.startPositionArr = []
+        }
+      })
+    },
    // 表单提交
    dataFormSubmit () {
      this.$refs['dataForm'].validate(valid => {
--- a/src/views/modules/work/mttaskinfo.vue
+++ b/src/views/modules/work/mttaskinfo.vue
@@ -29,12 +29,12 @@
        align="center"
        label="添加时间">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="userName"
        header-align="center"
        align="center"
        label="操作员名称">
-      </el-table-column>
+      </el-table-column> -->
      <!-- <el-table-column
        prop="source"
        header-align="center"
@@ -71,12 +71,12 @@
        align="center"
        label="产品编码">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="specModel"
        header-align="center"
        align="center"
        label="具体型号">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="num"
        header-align="center"
--- a/src/views/modules/work/mttaskinfodet.vue
+++ b/src/views/modules/work/mttaskinfodet.vue
@@ -1,8 +1,16 @@
 <template>
  <div class="mod-config">
-    <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+    <el-form
+      :inline="true"
+      :model="dataForm"
+      @keyup.enter.native="getDataList()"
+    >
      <el-form-item>
-        <el-input v-model="dataForm.key" placeholder="参数名" clearable></el-input>
+        <el-input
+          v-model="dataForm.key"
+          placeholder="参数名"
+          clearable
+        ></el-input>
      </el-form-item>
      <el-form-item>
        <el-button @click="getDataList()">查询</el-button>
@@ -12,80 +20,118 @@
    </el-form>
    <el-table
      :data="dataList"
-        :stripe="true"
-        :header-cell-style="{background:'#eef1f6',color:'#606266',height: '56px'}"
+      :stripe="true"
+      :header-cell-style="{
+        background: '#eef1f6',
+        color: '#606266',
+        height: '56px'
+      }"
      border
      v-loading="dataListLoading"
-      style="width: 100%;">
+      style="width: 100%;"
+    >
      <el-table-column
        type="index"
        label="序号"
        header-align="center"
        align="center"
-        width="50">
+        width="50"
+      >
      </el-table-column>
      <el-table-column
        prop="createTime"
        header-align="center"
        align="center"
-        label="添加时间">
+        label="添加时间"
+      >
      </el-table-column>
      <el-table-column
        prop="warehousRankName"
        header-align="center"
        align="center"
-        label="库位名称">
+        label="库位名称"
+      >
      </el-table-column>
      <el-table-column
        prop="taskType"
        header-align="center"
        align="center"
-        label="任务类型">
+        label="任务类型"
+      >
        <template slot-scope="scope">
-          <span>{{scope.row.taskType === 0?'出库' :scope.row.taskType === 1?'入库': '移库'}}</span>
+          <span>{{
+            scope.row.taskType === 0
+              ? "出库"
+              : scope.row.taskType === 1
+              ? "入库"
+              : "移库"
+          }}</span>
        </template>
      </el-table-column>
+      <el-table-column
+        prop="targetRoll"
+        header-align="center"
+        align="center"
+        label="目标辊筒"
+      >
+      </el-table-column>
      <el-table-column
        prop="warehousRankName"
        header-align="center"
        align="center"
-        label="起点">
+        label="起点"
+      >
      </el-table-column>
      <el-table-column
        prop="targetPosition"
        header-align="center"
        align="center"
-        label="终点">
+        label="终点"
+      >
        <template slot-scope="scope">
-          <span>{{ endPosition.find(item=>item.value === scope.row.targetPosition)?.label }}</span>
+          <span>{{
+            endPosition.find(item => item.value === scope.row.targetPosition)
+            ?endPosition.find(item => item.value === scope.row.targetPosition).label
+            : ''
+          }}</span>
        </template>
      </el-table-column>
      <el-table-column
        prop="status"
        header-align="center"
        align="center"
-        label="状态">
+        label="状态"
+      >
        <template slot-scope="scope">
-          <span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'数据接收中': '数据接收完成'}}</span>
+          <span>{{
+            scope.row.status === 0
+              ? "接收数据"
+              : scope.row.status === 1
+              ? "数据接收中"
+              : "数据接收完成"
+          }}</span>
        </template>
      </el-table-column>
      <el-table-column
        prop="taskDetCode"
        header-align="center"
        align="center"
-        label="任务编码">
+        label="任务编码"
+      >
      </el-table-column>
      <el-table-column
        prop="specModel"
        header-align="center"
        align="center"
-        label="型号">
+        label="型号"
+      >
      </el-table-column>
      <el-table-column
        prop="num"
        header-align="center"
        align="center"
-        label="数量">
+        label="数量"
+      >
      </el-table-column>
      <!-- <el-table-column
        prop="unit"
@@ -121,7 +167,8 @@
        prop="remarks"
        header-align="center"
        align="center"
-        label="备注">
+        label="备注"
+      >
      </el-table-column>
      <!-- <el-table-column
        fixed="right"
@@ -136,101 +183,105 @@
      </el-table-column> -->
    </el-table>
    <!-- 弹窗, 新增 / 修改 -->
-    <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+    <add-or-update
+      v-if="addOrUpdateVisible"
+      ref="addOrUpdate"
+      @refreshDataList="getDataList"
+    ></add-or-update>
  </div>
 </template>

 <script>
-  import AddOrUpdate from './mttaskinfodet-add-or-update'
-  export default {
-    data () {
-      return {
-        dataForm: {
-          key: ''
+import AddOrUpdate from './mttaskinfodet-add-or-update'
+export default {
+  data () {
+    return {
+      dataForm: {
+        key: ''
+      },
+      taskId: '',
+      dataList: [],
+      endPosition: [
+        {
+          value: 290,
+          label: 'A库出口'
        },
-        taskId: '',
-        dataList: [],
-        endPosition: [
-          {
-            value: 290,
-            label: 'A库出口'
-          },
-          {
-            value: 292,
-            label: 'B库出口'
-          }
-        ],
-        dataListLoading: false,
-        addOrUpdateVisible: false
-      }
+        {
+          value: 292,
+          label: 'B库出口'
+        }
+      ],
+      dataListLoading: false,
+      addOrUpdateVisible: false
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  activated () {
+    this.taskId = this.$route.params.id
+    this.getDataList()
+  },
+  methods: {
+    // 获取数据列表
+    getDataList () {
+      this.dataListLoading = true
+      this.$http({
+        url: this.$http.adornUrl('/work/mttaskinfodet/list'),
+        method: 'get',
+        params: this.$http.adornParams({
+          task_id: this.taskId,
+          page: 1,
+          limit: 500,
+          key: this.dataForm.key
+        })
+      }).then(({ data }) => {
+        console.log(data)
+        if (data && data.code === 0) {
+          this.dataList = data.list
+        } else {
+          this.dataList = []
+        }
+        this.dataListLoading = false
+      })
    },
-    components: {
-      AddOrUpdate
+    // 新增 / 修改
+    addOrUpdateHandle (id) {
+      this.addOrUpdateVisible = true
+      this.$nextTick(() => {
+        this.$refs.addOrUpdate.init(id)
+      })
    },
-    activated () {
-      this.taskId = this.$route.params.id
-      this.getDataList()
-    },
-    methods: {
-      // 获取数据列表
-      getDataList () {
-        this.dataListLoading = true
+    // 删除
+    deleteHandle (id) {
+      this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
        this.$http({
-          url: this.$http.adornUrl('/work/mttaskinfodet/list'),
-          method: 'get',
-          params: this.$http.adornParams({
-            'task_id': this.taskId,
-            'page': 1,
-            'limit': 500,
-            'key': this.dataForm.key
-          })
-        }).then(({data}) => {
-          console.log(data)
+          url: this.$http.adornUrl('/work/mttaskinfodet/delete'),
+          method: 'post',
+          data: this.$http.adornData(id, false)
+        }).then(({ data }) => {
          if (data && data.code === 0) {
-            this.dataList = data.list
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+                this.getDataList()
+              }
+            })
          } else {
-            this.dataList = []
+            this.$message.error(data.msg)
          }
-          this.dataListLoading = false
        })
-      },
-      // 新增 / 修改
-      addOrUpdateHandle (id) {
-        this.addOrUpdateVisible = true
-        this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
-        })
-      },
-      // 删除
-      deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行删除操作?`, '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.$http({
-            url: this.$http.adornUrl('/work/mttaskinfodet/delete'),
-            method: 'post',
-            data: this.$http.adornData(id, false)
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.$message({
-                message: '操作成功',
-                type: 'success',
-                duration: 1500,
-                onClose: () => {
-                  this.getDataList()
-                }
-              })
-            } else {
-              this.$message.error(data.msg)
-            }
-          })
-        })
-      },
-      goback () {
-        this.$router.go(-1)
-      }
+      })
+    },
+    goback () {
+      this.$router.go(-1)
    }
  }
+}
 </script>
--- a/src/views/modules/work/mttaskinfolog.vue
+++ b/src/views/modules/work/mttaskinfolog.vue
@@ -29,24 +29,24 @@
        align="center"
        label="添加时间">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="updateTime"
        header-align="center"
        align="center"
        label="修改时间">
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
        prop="userName"
        header-align="center"
        align="center"
        label="操作员名称">
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
        prop="source"
        header-align="center"
        align="center"
        label="来源">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="taskType"
        header-align="center"
@@ -62,21 +62,21 @@
        align="center"
        label="状态">
        <template slot-scope="scope">
-          <span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'数据接收中': scope.row.status === 2?'数据接收完成':'等待接收数据'}}</span>
+          <span>{{scope.row.status === 0?'接收数据' :scope.row.status === 1?'接收中': scope.row.status === 2?'接收完成':'等待接收'}}</span>
        </template>
      </el-table-column>
      <el-table-column
-        prop="taskCode"
+        prop="taskDetCode"
        header-align="center"
        align="center"
        label="任务编码">
      </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
        prop="productCode"
        header-align="center"
        align="center"
        label="产品编码">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="specModel"
        header-align="center"
@@ -154,7 +154,7 @@
      getDataList () {
        this.dataListLoading = true
        this.$http({
-          url: this.$http.adornUrl('/work/mttaskinfolog/list'),
+          url: this.$http.adornUrl('/work/mttaskinfodetlog/list'),
          method: 'get',
          params: this.$http.adornParams({
            'page': this.pageIndex,
--- a/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue
+++ b/src/views/modules/work/mtwarehouspositionrelat-add-or-update.vue
@@ -17,10 +17,10 @@
      <el-input v-model="dataForm.specModel" placeholder="详细规格" clearable />
    </el-form-item> -->
    <el-form-item label="产品编码" prop="productCode">
-      <el-input v-model="dataForm.productCode" placeholder="产品编码" readonly />
+      <el-input v-model="dataForm.productCode" placeholder="产品编码" disabled />
    </el-form-item>
    <el-form-item label="板材名称" prop="productName">
-      <el-input v-model="dataForm.productName" placeholder="板材名称" readonly />
+      <el-input v-model="dataForm.productName" placeholder="板材名称" disabled />
    </el-form-item>
    <el-form-item label="货物数量" prop="quantity">
      <el-input v-model="dataForm.quantity" placeholder="货物数量， 货物总的数量" clearable />
@@ -29,7 +29,7 @@
      <el-input v-model="dataForm.warehousPositionId" placeholder="库位id，关联表：mt_warehous_rank" clearable />
    </el-form-item> -->
    <el-form-item label="库位名称" prop="warehousPositionName">
-      <el-input v-model="dataForm.warehousPositionName" placeholder="库位名称" readonly />
+      <el-input v-model="dataForm.warehousPositionName" placeholder="库位名称" disabled />
    </el-form-item>
    <!-- <el-form-item label="批次号" prop="dateNum">
      <el-input v-model="dataForm.dateNum" placeholder="批次号" clearable />
--- a/src/views/modules/work/mtwarehouspositionrelat.vue
+++ b/src/views/modules/work/mtwarehouspositionrelat.vue
@@ -35,12 +35,12 @@
        align="center"
        label="修改时间">
      </el-table-column> -->
-      <el-table-column
+      <!-- <el-table-column
        prop="userName"
        header-align="center"
        align="center"
        label="操作员">
-      </el-table-column>
+      </el-table-column> -->
      <el-table-column
        prop="status"
        header-align="center"
@@ -89,7 +89,7 @@
        label="货物数量">
      </el-table-column>
      <el-table-column
-        prop="warehousPositionName"
+        prop="warehousePositionName"
        header-align="center"
        align="center"
        label="库位名称">
--- a/static/config/index.js
+++ b/static/config/index.js
@@ -2,7 +2,7 @@
 * @Author: zwq
 * @Date: 2021-11-15 08:20:28
 * @LastEditors: zwq
- * @LastEditTime: 2022-05-23 10:10:55
+ * @LastEditTime: 2023-03-07 15:49:28
 * @Description:
 */
 /**
@@ -12,7 +12,7 @@
  window.SITE_CONFIG = {}

  // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.16:8089/wms-qy/'
+  window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.12:8089/wms-qy/'

  // cdn地址 = 域名 + 版本号
  window.SITE_CONFIG['domain'] = './' // 域名