MrShi
2025-01-15 d2057f9fd66a382e615b449d1e8b6990c34a0599
对接口
已添加4个文件
已修改6个文件
310 ■■■■■ 文件已修改
admin/src/api/ywProblem.js 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/ywStock.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/ywStocktaking.js 23 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/ywTempConfig.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/contract/components/terminateLease.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/finance/collectionSettings.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/stock/check.vue 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/stock/query.vue 66 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/workorder/problemReporting.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/ywProblem.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
import request from '@/utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/ywProblem/page', data, {
    trim: true
  })
}
// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/ywProblem/create', data)
}
// æ ¹æ®ID修改
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/ywProblem/updateById', data)
}
// åˆ é™¤
export function deleteById (id) {
  return request.get(`/visitsAdmin/cloudService/business/ywProblem/delete/${id}`)
}
admin/src/api/ywStock.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
import request from '@/utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/ywStock/page', data, {
    trim: true
  })
}
admin/src/api/ywStocktaking.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,23 @@
import request from '@/utils/request'
// æŸ¥è¯¢
export function fetchList (data) {
  return request.post('/visitsAdmin/cloudService/business/ywStocktaking/page', data, {
    trim: true
  })
}
// åˆ›å»º
export function create (data) {
  return request.post('/visitsAdmin/cloudService/business/ywStocktaking/create', data)
}
// æ ¹æ®ID修改
export function updateById (data) {
  return request.post('/visitsAdmin/cloudService/business/ywStocktaking/updateById', data)
}
// åˆ é™¤
export function deleteById (id) {
  return request.get(`/visitsAdmin/cloudService/business/ywStocktaking/delete/${id}`)
}
admin/src/api/ywTempConfig.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
import request from '@/utils/request'
// èŽ·å–æ•°æ®
export function getCallTemp (data) {
  return request.get('/visitsAdmin/cloudService/business/ywTempConfig/getCallTemp', data, {
    trim: true
  })
}
admin/src/views/Inspection/components/OperaYwPatrolSchemeWindow.vue
@@ -14,7 +14,7 @@
        </el-select>
      </el-form-item>
      <el-form-item label="巡检负责人" prop="userIds">
        <el-select v-model="form.userIds" filterable clearable>
        <el-select v-model="form.userIds" multiple filterable clearable>
          <el-option v-for="item in staffList" :value="item.id" :label="item.realname"></el-option>
        </el-select>
      </el-form-item>
@@ -76,7 +76,7 @@
        status: '',
        sortnum: '',
        lineId: '',
        userIds: '',
        userIds: [],
        dealUserId: '',
        dealDate: '',
        dealInfo: '',
@@ -118,6 +118,52 @@
    })
  },
  methods: {
    __confirmCreate () {
      this.$refs.form.validate((valid) => {
        if (!valid) {
          return
        }
        let obj = JSON.parse(JSON.stringify(this.form))
        obj.userIds = obj.userIds.join(',')
        // è°ƒç”¨æ–°å»ºæŽ¥å£
        this.isWorking = true
        this.api.create(obj)
          .then(() => {
            this.visible = false
            this.$tip.apiSuccess('新建成功')
            this.$emit('success')
          })
          .catch(e => {
            // this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking = false
          })
      })
    },
    __confirmEdit () {
      this.$refs.form.validate((valid) => {
        if (!valid) {
          return
        }
        let obj = JSON.parse(JSON.stringify(this.form))
        obj.userIds = obj.userIds.join(',')
        // è°ƒç”¨æ–°å»ºæŽ¥å£
        this.isWorking = true
        this.api.updateById(obj)
          .then(() => {
            this.visible = false
            this.$tip.apiSuccess('修改成功')
            this.$emit('success')
          })
          .catch(e => {
            // this.$tip.apiFailed(e)
          })
          .finally(() => {
            this.isWorking = false
          })
      })
    },
    weekClick(i) {
      this.weeks.forEach((item, index) => {
        if (i == index) { item.sel = !item.sel }
admin/src/views/contract/components/terminateLease.vue
@@ -86,12 +86,19 @@
                <el-table-column
                    width="100"
                    label="费用类型">
                    <template slot-scope="{row}">
                        <span v-if="row.costType === 0">租赁费</span>
                        <span v-if="row.costType === 1">物业费</span>
                        <span v-if="row.costType === 4">水电费</span>
                        <span v-if="row.costType === 5">杂项费</span>
                        <span v-if="row.costType === 6">其他</span>
                    <template slot-scope="scope">
                        <div style="display: flex; align-items: center;">
                            <span v-if="scope.row.costType === 0">租赁费</span>
                            <span v-if="scope.row.costType === 1">物业费</span>
                            <span v-if="scope.row.costType === 4">水电费</span>
                            <span v-if="scope.row.costType === 5">杂项费</span>
                            <span v-if="scope.row.costType === 6">其他</span>
                            <i class="el-icon-delete"
                               style="color: red; margin-left: 10px; font-size: 18px; cursor: pointer;"
                               @click="deleRow(scope.$index)"
                               v-if="scope.row.date && scope.row.date.length !==0">
                            </i>
                        </div>
                    </template>
                </el-table-column>
                <el-table-column
@@ -270,6 +277,10 @@
        this.changeBtDate(this.form.btDate)
        this.visible = true
      },
      deleRow(index) {
        this.info.terminateList.splice(index, 1)
        this.countData()
      },
      getDayTime () {
        const today = new Date();
        const year = today.getFullYear();
admin/src/views/finance/collectionSettings.vue
@@ -25,6 +25,7 @@
<script>
    import templateKeywords from './components/templateKeywords'
    import { getCallTemp } from '@/api/ywTempConfig'
  export default {
    name: 'collectionSettings',
    data() {
@@ -34,7 +35,18 @@
        }
      }
    },
    components: { templateKeywords }
    components: { templateKeywords },
    created () {
      this.getCallTempVal()
    },
    methods: {
      getCallTempVal() {
        getCallTemp({})
            .then(res => {
              console.log(res)
            })
      }
    }
  }
</script>
admin/src/views/stock/check.vue
@@ -5,18 +5,25 @@
      <el-button type="primary" @click="handleEx()" v-permissions="['business:ywpatrolline:create']">添加</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="盘点单名称" min-width="120" show-overflow-tooltip />
      <el-table-column prop="platformGroupName" label="盘点仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="盘点员" min-width="80" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="盘点日期" min-width="110" show-overflow-tooltip />
      <el-table-column prop="param1" label="创建人" min-width="80" show-overflow-tooltip />
      <el-table-column prop="param2" label="创建时间" min-width="140" show-overflow-tooltip />
      <el-table-column prop="workTime" label="盘点状态" min-width="80" show-overflow-tooltip />
      <el-table-column prop="name" label="盘点单名称" min-width="120" show-overflow-tooltip />
      <el-table-column prop="warehouseName" label="盘点仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="userName" label="盘点员" min-width="80" show-overflow-tooltip />
      <el-table-column prop="dealDate" label="盘点日期" min-width="110" show-overflow-tooltip />
      <el-table-column prop="createName" label="创建人" min-width="80" show-overflow-tooltip />
      <el-table-column prop="createDate" label="创建时间" min-width="140" show-overflow-tooltip />
      <el-table-column label="盘点状态" min-width="80">
        <template v-slot="{ row }">
          <span v-if="row.status === 0">未开始</span>
          <span v-if="row.status === 1">进行中</span>
          <span v-if="row.status === 2">已完成</span>
          <span v-if="row.status === 3">已取消</span>
        </template>
      </el-table-column>
      <el-table-column prop="workTime" label="操作" min-width="140" show-overflow-tooltip>
        <template v-slot="{ row }">
          <span class="primaryColor pointer">查看详情</span>
          <span class="primaryColor pointer">取消</span>
          <span class="primaryColor pointer">删除</span>
          <el-button type="text">查看详情</el-button>
          <el-button type="text">取消</el-button>
          <el-button type="text">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -32,7 +39,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { platformLogPage, getPlatformGroupList } from '@/api'
import { fetchList } from '@/api/ywStocktaking'
export default {
  components: {
    Pagination,
@@ -52,15 +59,20 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'carCodeFront',
            filed: 'name',
            type: 'input',
            label: '盘点单',
            label: '盘点单名称',
          },
          {
            filed: 'platformGroupId',
            filed: 'status',
            type: 'select',
            label: '盘点状态',
            options: []
            options: [
              { value: 0, label: '未开始' },
              { value: 1, label: '进行中' },
              { value: 2, label: '已完成' },
              { value: 3, label: '已取消' }
            ]
          },
        ],
        online: true
@@ -68,50 +80,21 @@
    }
  },
  created() {
    // this.getList()
    // this.getGroupList()
    this.getList()
  },
  methods: {
    handleSub() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
          alert('submit!')
        }
      })
    },
    handleEx() { },
    getGroupList() {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
        this.queryFormConfig.formItems[1].options = res.map(i => {
          return {
            value: i.id,
            label: i.name
          }
        })
        // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '全部月台组' })
      })
    },
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      platformLogPage({
      fetchList({
        model: {
          ...filters,
          queryStatus: '6,7,8',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          ...filters
        },
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.param3, 'seconds').format('H时m分s秒')
        })
        this.pagination.total = res.total || 0
      }, () => {
        this.loading = false
admin/src/views/stock/query.vue
@@ -2,16 +2,16 @@
  <div class="main_app">
    <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
    <div class="mt20">
      <el-button @click="handleEx()" v-permissions="['business:ywpatrolline:create']">导出</el-button>
      <el-button v-permissions="['business:ywpatrolline:create']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="platformName" label="资产编码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="platformGroupName" label="资产名称" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="条码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="carCodeBack" label="品牌" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param1" label="规格型号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="param2" label="所在仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="workTime" label="库存" min-width="80" show-overflow-tooltip />
      <el-table-column prop="materialId" label="资产编码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialName" label="资产名称" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialQrcode" label="条码" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialBrand" label="品牌" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialAttr" label="规格型号" min-width="100" show-overflow-tooltip />
      <el-table-column prop="warehouseName" label="所在仓库" min-width="100" show-overflow-tooltip />
      <el-table-column prop="stock" label="库存" min-width="80" show-overflow-tooltip />
    </el-table>
    <div class="mt20">
      <Pagination @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
@@ -25,7 +25,7 @@
import dayjs from 'dayjs'
import duration from 'dayjs/plugin/duration'
dayjs.extend(duration)
import { platformLogPage, getPlatformGroupList } from '@/api'
import { fetchList } from '@/api/ywStock'
export default {
  components: {
    Pagination,
@@ -45,72 +45,42 @@
      queryFormConfig: {
        formItems: [
          {
            filed: 'platformGroupId',
            filed: 'warehouseId',
            type: 'select',
            label: '所在仓库',
            options: []
          },
          {
            filed: 'carCodeFront',
            filed: 'materialId',
            type: 'input',
            label: '资产信息',
            placeholder: '请输入资产名称/编码'
            label: '物料名称/编码',
            placeholder: '请输入物料名称/编码'
          },
          {
            filed: 'carCodeFront',
            filed: 'materialAttr',
            type: 'input',
            label: '型号',
          },
        ],
        online: true
        ]
      }
    }
  },
  created() {
    // this.getList()
    // this.getGroupList()
    this.getList()
  },
  methods: {
    handleSub() {
      this.$refs.ruleForm.validate((valid) => {
        if (valid) {
          alert('submit!')
        }
      })
    },
    handleEx() { },
    getGroupList() {
      getPlatformGroupList({ queryData: 0, queryType: 0 }).then(res => {
        this.queryFormConfig.formItems[1].options = res.map(i => {
          return {
            value: i.id,
            label: i.name
          }
        })
        // this.queryFormConfig.formItems[1].options.unshift({ value: '', label: '全部月台组' })
      })
    },
    getList(page) {
      const { pagination, filters } = this
      this.loading = true
      platformLogPage({
      fetchList({
        model: {
          ...filters,
          queryStatus: '6,7,8',
          beginWorkDateStart: filters.selDate && filters.selDate.length > 0 ? filters.selDate[0] : null,
          beginWorkDateEnd: filters.selDate && filters.selDate.length > 0 ? filters.selDate[1] : null,
          ...filters
        },
        sorts: [{ direction: 'DESC', property: 'param1' }],
        capacity: pagination.pageSize,
        page: page || pagination.page,
      }).then(res => {
        this.loading = false
        this.list = res.records || []
        this.list.forEach(item => {
          item.inTypeTemp = item.inType == 0 ? '整托盘' : '件烟'
          item.taskOrigin = 'WMS获取'
          item.workTime = dayjs.duration(item.param3, 'seconds').format('H时m分s秒')
        })
        this.pagination.total = res.total || 0
      }, () => {
        this.loading = false
admin/src/views/workorder/problemReporting.vue
@@ -28,20 +28,20 @@
        <!-- è¡¨æ ¼å’Œåˆ†é¡µ -->
        <template v-slot:table-wrap>
            <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
                <el-table-column prop="areaType" label="描述" min-width="70px"></el-table-column>
                <el-table-column prop="areaType" label="位置" min-width="100px"></el-table-column>
                <el-table-column prop="remark" label="描述" min-width="70px"></el-table-column>
                <el-table-column prop="position" label="位置" min-width="100px"></el-table-column>
                <el-table-column prop="categoryName" label="现场图片" min-width="100px"></el-table-column>
                <el-table-column prop="creatorName" label="上报人" min-width="80px"></el-table-column>
                <el-table-column prop="createDate" label="上报人电话" min-width="100px"></el-table-column>
                <el-table-column prop="dealUserName" label="上报时间" min-width="80px"></el-table-column>
                <el-table-column prop="name" label="上报人" min-width="80px"></el-table-column>
                <el-table-column prop="phone" label="上报人电话" min-width="100px"></el-table-column>
                <el-table-column prop="submitDate" label="上报时间" min-width="80px"></el-table-column>
                <el-table-column label="处理状态" min-width="70px">
                    <template slot-scope="{row}">
                        <span v-if="row.dealStatus == 0">待指派</span>
                        <span v-if="row.dealStatus == 1">已指派</span>
                        <span v-if="row.dealStatus == 2">已处理</span>
                    </template>
                    </template>`
                </el-table-column>
                <el-table-column prop="creatorName" label="处理人" min-width="80px"></el-table-column>
                <el-table-column prop="dealUserName" label="处理人" min-width="80px"></el-table-column>
                <el-table-column
                    v-if="containPermissions(['business:ywworkorder:update'])"
                    label="操作"
@@ -91,8 +91,8 @@
    },
    created() {
      this.config({
        module: '运维工单信息表',
        api: '/workorder/ywWorkorder',
        module: '问题上报信息表',
        api: '/ywProblem',
        'field.id': 'id',
        'field.main': 'id'
      })