ll

liukangdong

2025-02-06 87b4f9e646ba88b7a4f5924deacc7984786ed5d2

ll

 admin/src/views/stock/components/config.js

@@ -3,13 +3,14 @@
  { name: '领用退回', id: 1, type: 0 },
  { name: '库存调整', id: 2, type: 0 },
  { name: '其它入库', id: 3, type: 0 },
  // { name: '盘盈入库', id: 4, type: 0 },
  { name: '盘盈入库', id: 4, type: 0 },
  
  { name: '领用出库', id: 5, type: 1 },
  { name: '仓库出单', id: 6, type: 1 },
  { name: '调整出库', id: 7, type: 1 },
  { name: '采购出库', id: 8, type: 1 },
  { name: '其它出库', id: 9, type: 1 },
  // { name: '盘出出库', id: 10, type: 1 },
  { name: '盘出出库', id: 10, type: 1 },
]
export const rules = {
  warehouseId: [{ required: true, message: '请选择', trigger: 'blur' }],

 admin/src/views/stock/out.vue

@@ -87,7 +87,7 @@
            label: '出库类型',
            labelCode: 'name',
            valueCode: 'id',
            options: StoreTypeOps.filter(i => i.type == 0)
            options: StoreTypeOps.filter(i => i.type == 1)
          },
        ],
        online: true

 admin/src/views/stock/record.vue

@@ -5,7 +5,7 @@
      <el-button @click="handleEx()" v-permissions="['business:ywoutinboundrecord:exportExcel']">导出</el-button>
    </div>
    <el-table v-loading="loading" :data="list" stripe>
      <el-table-column prop="doneDate" label="单据日期" min-width="90" show-overflow-tooltip />
      <el-table-column prop="doneDate" label="单据日期" min-width="100" show-overflow-tooltip />
      <el-table-column prop="materialCode" label="物料编码" min-width="90" show-overflow-tooltip />
      <el-table-column prop="materialName" label="物料名称" min-width="90" show-overflow-tooltip />
      <el-table-column prop="carCodeFront" label="物料分类" min-width="120" show-overflow-tooltip>

 h5/pages.json

@@ -118,6 +118,13 @@
            {
                "navigationBarTitleText" : "任务中心"
            }
        },
        {
            "path" : "pages/polling/empty",
            "style" : 
            {
                "navigationBarTitleText" : "扫码巡检"
            }
        }

    ],

    "globalStyle": {


 h5/pages/login.vue

@@ -29,8 +29,8 @@
        loginPost,

        getUserInfo,

        sendSMsPost,

        ywWxAuthorize,
		
        ywWxAuthorize,



        getRecordByUserPoint

    } from '@/api'

    import {

@@ -45,7 +45,7 @@
                form: {

                    phone: '',

                    code: ''

                },
                },

                ywinfo: {},

                downTime: 0,

                code: ''

@@ -53,11 +53,11 @@
        },

        onLoad(option) {

            console.log('onLoad');

            // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid
            const ywinfo = uni.getStorageSync('ywinfo') || {}
            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
                this.ywinfo = ywinfo
                uni.setStorageSync('ywinfo', {})
            // https://zhcg.fnwtzx.com/#/pages/login?type=0&ywid=ywid

            const ywinfo = uni.getStorageSync('ywinfo') || {}

            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {

                this.ywinfo = ywinfo

                uni.setStorageSync('ywinfo', {})

            }

            if (option.ywid || option.ywid == 0) {

                uni.setStorageSync('ywinfo', {

@@ -83,7 +83,7 @@
                    code: code || this.code

                }).then(res => {

                    if (res.code === 200) {

                        console.log('res', res);

                        // console.log('res', res);

                        that.$store.commit('setOpenId', res.data.openid)

                        if (res.data.token && res.data.token != '') {

                            that.$store.commit('setToken', res.data.token)

@@ -91,13 +91,19 @@
                                that.$store.commit('setUserInfo', ress.data)

                            })

                            const ywinfo = this.ywinfo

                            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
                                getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                                    if(res.data && res.data.id){
                                        uni.redirectTo({
                                            url: "/pages/polling/point?id=" + res.data.id
                                        })
                                    }
                            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {

                                getRecordByUserPoint({

                                    pointCode: ywinfo.ywid

                                }).then(res => {

                                    if (res.data && res.data.id) {

                                        uni.redirectTo({

                                            url: "/pages/polling/point?id=" + res.data.id

                                        })

                                    } else {

                                        uni.redirectTo({

                                            url: "/pages/polling/empty"

                                        })

                                    }

                                })

                            } else {

                                setTimeout(() => {

@@ -111,8 +117,8 @@
                })

            } else {

                // let url = 'https://zhcg.fnwtzx.com/yunwei_h5'

                // const appID = 'wx95ac1efb67f0330d'
                let url = 'https://dmtest.ahapp.net/yunwei_h5'
                // const appID = 'wx95ac1efb67f0330d'

                let url = 'https://dmtest.ahapp.net/yunwei_h5'

                const appID = 'wx4d7c10bdec51942b'

                let uri = encodeURIComponent(url)

                let authURL =

@@ -145,22 +151,28 @@
                        this.setToken(res.data)

                        this.showToast('登录成功')

                        getUserInfo().then(ress => {

                            this.setUserInfo(ress.data)
                            const ywinfo = this.ywinfo
                            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {
                            getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                                getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {
                                    if(res.data && res.data.id){
                                        uni.redirectTo({
                                            url: "/pages/polling/point?id=" + res.data.id
                                        })
                                    }
                                })
                            })
                            } else {
                                uni.redirectTo({
                                    url: "/pages/index"
                                })
                            this.setUserInfo(ress.data)

                            const ywinfo = this.ywinfo

                            if (ywinfo.ywid && (ywinfo.type || ywinfo.type == 0)) {

                                // getRecordByUserPoint({pointCode: ywinfo.ywid}).then(res => {

                                getRecordByUserPoint({

                                    pointCode: ywinfo.ywid

                                }).then(res => {

                                    if (res.data && res.data.id) {

                                        uni.redirectTo({

                                            url: "/pages/polling/point?id=" + res.data.id

                                        })

                                    } else {

                                        uni.redirectTo({

                                            url: "/pages/polling/empty"

                                        })

                                    }

                                })

                                // })

                            } else {

                                uni.redirectTo({

                                    url: "/pages/index"

                                })

                            }

                        })

                    }


 h5/pages/polling/detail.vue

@@ -42,7 +42,7 @@
                    <template v-if="item.status == 1">

                        <view class="line">

                            <view class="la">巡检结果：</view>

                            <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '正常' : '异常' }}</view>

                            <view class="val" :class="{ red: item.dealStatus == 1 }">{{ item.dealStatus == 0 ? '正常' : item.dealStatus == 1 ? '异常' : '-' }}</view>

                        </view>

                        <view class="line">

                            <view class="la">巡检时间：</view>

@@ -181,7 +181,7 @@
                    this.info = res.data

                    let time = new Date(res.data.startDate).getTime()

                    console.log('res.data.startDate', new Date().getTime());

                    this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1)

                    this.flag = new Date().getTime() > time && (this.info.status == 0 || this.info.status == 1 || this.info.status == 2)

                })

                ywPatrolTaskRecord({

                    capacity: 999,


 h5/pages/polling/empty.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,49 @@
<template>
    <view class="main_app">
        <image class="logo" src="@/static/side/default_empty@2x.png" mode=""></image>
        <view class="btn" @click="backHome">返回主页</view>
    </view>
</template>

<script>
    export default {
        data() {
            return {
				
            };
        },
        methods: {
            backHome(){
                uni.redirectTo({
                    url: '/pages/index'
                })
            }
        }
    }
</script>

<style lang="scss">
.main_app{
    .logo{
        width: 272rpx;
        height: 228rpx;
        margin: 60% auto 0;
    }
    .btn{
        position: fixed;
        bottom: 64rpx;
        left: 40rpx;
        width: 670rpx;
        height: 88rpx;
        background: #0068FF;
        box-shadow: 0rpx 8rpx 20rpx 0rpx rgba(0,104,255,0.3);
        border-radius: 44rpx;
        display: flex;
        align-items: center;
        justify-content: center;
        font-weight: 500;
        font-size: 32rpx;
        color: #FFFFFF;
    }
}
</style>

 h5/pages/polling/point.vue

@@ -8,7 +8,7 @@
            <template v-if="info.status == 1">

                <view class="line">

                    <div class="la">巡检结果：</div>

                    <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '正常' : '异常' }}

                    <div class="val primaryColor" :class="{red: info.dealStatus == 1}">{{ info.dealStatus == 0 ? '正常' : info.dealStatus == 1 ? '异常' : '-' }}

                    </div>

                </view>

                <view class="line">

@@ -141,10 +141,10 @@
                            id: 1,

                            name: '异常'

                        },

                        {

                            id: '',

                            name: '跳过'

                        },

                        // {

                        //     id: 2,

                        //     name: '跳过'

                        // },

                    ]

                ],
                


 h5/pages/polling/task.vue

@@ -44,7 +44,7 @@
                        <view class="line" @click="itemClick(item)">执行时间：{{ item.startDate.slice(11, 16) }} è‡³ {{ item.endDate.slice(11, 16) }}</view>

                        <view class="line">

                            <view @click="itemClick(item)">完成情况：{{item.finishNum || 0}}/{{item.patrolNum}}</view>

                            <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1)" class="btn" @click="openSc(item)">

                            <view v-if="param.queryStatus == '0,1' && item.flag && (item.status == 0 || item.status == 1 || item.status == 2)" class="btn" @click="openSc(item)">

                                <image src="@/static/side/ic_saoma@2x.png" class="saoma" mode=""></image>

                                <view>扫码巡检</view>

                            </view>


 h5/static/side/default_empty@2x.png

 h5/utils/service.js

@@ -37,10 +37,10 @@
                        if (data.code === 500 || data.code === 5112) {
                            uni.clearStorageSync()
                            return uni.navigateTo({
                                url: '/pages/login/login'
                                url: '/pages/login'
                            })
                        }
                        return
                        return resolve(data)
                    }
                    resolve(data)
                    // return response.data