Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into...

jiangping

2023-10-16 d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9

 h5_standard/src/views/plannedProgress/details.vue

@@ -53,7 +53,7 @@
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">分配数量：</div>
                        <div class="content_list_item_content_item_nr">{{info.createTime}}</div>
                        <div class="content_list_item_content_item_nr" v-if="info.umodel">{{info.distributNum}}{{info.umodel.name}}</div>
                    </div>
                    <div class="content_list_item_content_item">
                        <div class="content_list_item_content_item_label">完工数量：</div>
@@ -64,20 +64,22 @@
        </div>
        <NotFound info="暂未分配工单" v-if="info.workorderList && info.workorderList.length === 0" />
        <template v-else>
            <div class="details_list">
                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item.id)">
            <!-- <div class="details_list">
                <div class="details_list_item" v-for="(item, i) in info.workorderList" :key="i" @click="jump(item)">
                    <div class="details_list_item_top">
                        <span>{{ item.createUserName }}</span><span>{{ item.code }}</span>
                        <span>{{ item.createUserName }}</span>
                        <span>{{ item.code }}</span>
                    </div>
                    <div class="details_list_item_center">
                        <span>良品数：{{ item.qualifiedNum }}</span><span>不良数：<span class="red">{{ item.unqualifiedNum }}</span></span>
                        <span>良品数：{{ item.qualifiedNum }}</span>
                        <span>不良数：<span class="red">{{ item.unqualifiedNum }}</span></span>
                    </div>
                    <div class="details_list_item_bottom">
                        <span>{{ item.createTime }}</span>
                    </div>
                </div>
            </div>
            <!-- <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
            </div> -->
            <div class="details_timeline" v-for="(item, i) in info.workorderList" :key="i">
                <div class="details_timeline_header">
                    <div class="details_timeline_header_code">
                        <span>工单编号：{{item.code}}</span>
@@ -89,10 +91,10 @@
                    <span v-if="item.status === 3" class="purple">已检验</span>
                    <span v-if="item.status === 4">已报工</span>
                    <span v-if="item.status === 5">已入库</span>
                    <span v-if="item.status === 6">已取消</span> -->
                    <span v-if="item.status === 6">已取消</span>
                    <!--                <span v-if="item.status === 7">已取消</span>-->
                    <!--                <span v-if="item.status === 8">已关闭</span>-->
                <!-- </div>
                </div>
                <div class="details_timeline_item" v-if="item.produceDate">
                    <div class="activedian"></div>
                    <div class="dian active"></div>
@@ -153,8 +155,10 @@
                        </div>
                    </div>
                </div>
            </div> -->
            </div>
        </template>
        <!-- <div class="details_zw"></div> -->
        <!-- <div class="details_btn" @click="toJump">去报工</div> -->
    </div>
</template>

@@ -182,8 +186,17 @@
            })
    }

    const jump = (id: any) => {
        router.push({ name: 'workOrderReporting', query: { id } })
    const toJump = () => {
        router.push({ name: 'reportingForWork' })
    }

    const jump = (item: any) => {
        if (item.status === 4 || item.status === 6 || item.paused === 1) {
            router.push({ name: 'afterWorkReport', query: { id: item.id } })
        } else {
            router.push({ name: 'workOrderReporting', query: { id: item.id } })
        }
        // router.push({ name: 'workOrderReporting', query: { id } })
    }

    const proUserStr = (item: any) => {
@@ -210,6 +223,26 @@
    height: 100%;
    position: absolute;
    background: #F7F7F7;
    .details_zw {
        width: 100%;
        height: 148px;
    }
    .details_btn {
        position: fixed;
        bottom: 60px;
        left: 30px;
        width: calc(100% - 60px);
        height: 88px;
        line-height: 88px;
        text-align: center;
        background: #305ED5;
        box-shadow: 0px 0px 12px 0px rgba(0,0,0,0.08);
        border-radius: 8px;
        font-size: 30px;
        font-family: PingFangSC-Medium, PingFang SC;
        font-weight: 500;
        color: #FFFFFF;
    }
    .van-skeleton {
        padding: 0 !important;
    }