报工台 首巡末 检验单 修改

chenhaozhe

8 天以前 ae3919d6406ac4a796ff3ffc35a5b4bd129e8a7c

报工台 首巡末 检验单 修改

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.096",
    "versionCode" : 296,
    "versionName" : "2.098",
    "versionCode" : 298,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/MJGL/SBMJReport/Sc_MouldMaintainTaskReport.vue

@@ -55,9 +55,9 @@
        <view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>

        <!-- 页签内容区域 -->
        <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab === tabIndex" id="pageContent"
        <scroll-view v-for="(tab, tabIndex) in tabs" :key="tabIndex" v-show="activeTab == tabIndex" id="pageContent"
            scroll-y class="page-content" :style="{height: pageContentHeight + 'px'}">
            <view class="list" v-for="(item,index) in tab.listData" :key="index">
            <view class="list" v-for="(item,index) in tab.showData" :key="index">
                <uni-card :title="item.器具号" :extra="item.器具保养计划单号" style="margin: 10px;"
                    @tap="showDetail = showDetail==item.hmainid?-1:item.hmainid">
                    <view class="card-detail">
@@ -183,9 +183,10 @@
                        type: 0,
                        count: 0,
                        listData: [], // 添加这个
                        showData: [],
                        pageMeta: { // 添加这个
                            curPage: 1,
                            size: 50,
                            size: 20,
                            total: 0,
                        }
                    },
@@ -194,9 +195,10 @@
                        type: 1,
                        count: 0,
                        listData: [], // 添加这个
                        showData: [],
                        pageMeta: { // 添加这个
                            curPage: 1,
                            size: 50,
                            size: 20,
                            total: 0,
                        }
                    },
@@ -205,9 +207,10 @@
                        type: 2,
                        count: 0,
                        listData: [], // 添加这个
                        showData: [],
                        pageMeta: { // 添加这个
                            curPage: 1,
                            size: 50,
                            size: 20,
                            total: 0,
                        }
                    }
@@ -288,6 +291,8 @@
                this.activeTab = index
                this.showDetail = -1
                this.operations = -1
                
                this.onPageChangeHandler({current: 1})
            },

            onDateRangePickerChangeHandler({
@@ -373,6 +378,10 @@
                        if (data && data.h_p_Sc_MouldMaintainTaskReport_APP) {
                            // 更新待签到页签
                            this.tabs[0].listData = data.h_p_Sc_MouldMaintainTaskReport_APP
                            this.tabs[0].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice( 
                                (this.tabs[0].pageMeta.curPage-1)*this.tabs[0].pageMeta.size,
                                (this.tabs[0].pageMeta.curPage)*this.tabs[0].pageMeta.size
                            )
                            this.tabs[0].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP.length
                            this.tabs[0].count = data.h_p_Sc_MouldMaintainTaskReport_APP.length
                        }
@@ -380,6 +389,11 @@
                        if (data && data.h_p_Sc_MouldMaintainTaskReport_APP1) {
                            // 更新待处理页签
                            this.tabs[1].listData = data.h_p_Sc_MouldMaintainTaskReport_APP1
                            
                            this.tabs[1].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
                                (this.tabs[1].pageMeta.curPage-1)*this.tabs[1].pageMeta.size,
                                (this.tabs[1].pageMeta.curPage)*this.tabs[1].pageMeta.size
                            )
                            this.tabs[1].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
                            this.tabs[1].count = data.h_p_Sc_MouldMaintainTaskReport_APP1.length
                        }
@@ -387,6 +401,10 @@
                        if (data && data.h_p_Sc_MouldMaintainTaskReport_APP2) {
                            // 更新待验收页签
                            this.tabs[2].listData = data.h_p_Sc_MouldMaintainTaskReport_APP2
                            this.tabs[2].showData = data.h_p_Sc_MouldMaintainTaskReport_APP.slice(
                                (this.tabs[2].pageMeta.curPage-1)*this.tabs[2].pageMeta.size,
                                (this.tabs[2].pageMeta.curPage)*this.tabs[2].pageMeta.size
                            )
                            this.tabs[2].pageMeta.total = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
                            this.tabs[2].count = data.h_p_Sc_MouldMaintainTaskReport_APP2.length
                        }
@@ -397,8 +415,15 @@
                })
            },

            onPageChangeHandler() {
                this.onSearchClickHandler()
            onPageChangeHandler({current}) {
                // this.onSearchClickHandler()
                this.tabs[this.activeTab].curPage = current
                this.tabs[this.activeTab].showData
                = this.tabs[this.activeTab].listData.slice(
                    (this.tabs[this.activeTab].pageMeta.curPage-1)*this.tabs[this.activeTab].pageMeta.size,
                    (this.tabs[this.activeTab].pageMeta.curPage)*this.tabs[this.activeTab].pageMeta.size
                )
                
                this.goTop()
            },
        },

 pages/ZLGL/OA_WorkLink/OA_WorkLinkBillQuery.vue

@@ -48,6 +48,9 @@
        </view>

        <!-- 工作联系单 列表 -->
        <view>

        </view>
        <view class="list" v-for="(item,index) in BillsDisplay" :key="index">
            <uni-card :title="item.制单日期.substr(0,10)" :extra="item.单据号" style="margin: 10px;"
                @tap="showDetail = showDetail==index?-1:index">
@@ -102,6 +105,7 @@
            </uni-card>
        </view>
        <view class="over" v-if="BillsDisplay.length == 0">暂无数据</view>

    </view>
</template>

@@ -132,7 +136,15 @@
                sWhere: "",
                showDetail: -1,
                operations: -1,

                page: 1,
                size: 20,

            };
        },
        // 触底加载
        onReachBottom() {
            console.log('触发触底加载...');
        },
        methods: {
            onDateRangePickerChangeHandler({
@@ -175,7 +187,7 @@
                }
            },
            onSearchClickHandler() {
               this.switchTab(this.tabs)
                this.switchTab(this.tabs)
            },
            onResetClickHandler() {
                this.dateRangePicker = ["任意间隔", "今天", "近两天", "近三天", "近四天", "近五天", "近六天", "近七天", "近30天"],
@@ -208,14 +220,17 @@
                this.getWorkLinkList()
            },
            async getWorkLinkList() {
                this.sWhere += ` and 日期 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 日期 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
                this.sWhere +=
                    ` and 日期 >= CONVERT(VARCHAR(10), '${this.startDate}', 23) and 日期 <= CONVERT(VARCHAR(10), '${this.endDate}', 23)`
                try {
                    

                    let res = await CommonUtils.doRequest2Async({
                        url: 'Sc_MESTransFerWorkBill/GetOA_WorkLinkBillList',
                        data: {
                            sWhere: this.sWhere,
                            user: getUserInfo()["Czymc"]
                            user: getUserInfo()["Czymc"],
                            page: this.page,
                            size: this.size
                        }
                    })


 pages/ZLGL/mojianjianyan/ProcessCheckBillList.vue

@@ -38,9 +38,9 @@
                <uni-card :title="item['单据号']" :extra="'日期:' + item['日期'].split('T')[0]"
                    @tap="showDetail = showDetail==index?-1:index">
                    <view class="card-detail">
                        <view class="detail" v-if="item['单据类型']">
                        <!--                        <view class="detail" v-if="item['单据类型']">
                            <text>单据类型：</text>{{item['单据类型']}}
                        </view>
                        </view> -->
                        <view class="detail" v-if="item['单据状态']">
                            <text>单据状态：</text>{{item['单据状态']}}
                        </view>
@@ -59,8 +59,8 @@
                        <view class="detail" v-if="item['检验方案']">
                            <text>检验方案：</text>{{item['检验方案']}}
                        </view>
                        <view class="detail" v-if="item['规格型号']">
                            <text>规格型号：</text>{{item['规格型号']}}
                        <view class="detail" v-if="item['判定结论']">
                            <text>检验状态：</text>{{item['判定结论']}}
                        </view>
                    </view>
                    <view class="card-detail" v-if="showDetail == index">
@@ -122,8 +122,10 @@
                    </view>
                    <view class="op" v-if="operations == index">
                        <button class="op3" size="mini" plain @tap.stop="edit(item)">编辑</button>
                        <button class="op3" size="mini" plain @tap.stop="audit(item, 0)" v-if="!listDataShow[index]['审核人']">审核</button>
                        <button class="op3" size="mini" plain @tap.stop="audit(item, 1)" v-if="listDataShow[index]['审核人']">反审核</button>
                        <button class="op3" size="mini" plain @tap.stop="audit(item, 0)"
                            v-if="!listDataShow[index]['审核人']">审核</button>
                        <button class="op3" size="mini" plain @tap.stop="audit(item, 1)"
                            v-if="listDataShow[index]['审核人']">反审核</button>
                        <button class="op4" size="mini" plain @tap.stop="del(item)">删除</button>
                        <button class="op5" size="mini" plain @tap.stop="operations = -1">取消操作</button>
                    </view>
@@ -193,7 +195,7 @@
            },
            cmdAdd() {
                uni.redirectTo({
                    url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
                    url: "/pages/ZLGL/mojianjianyan/ProcessCheckBill?operationType=1"
                })
            },
            async cmdSearch() {
@@ -251,9 +253,9 @@

            },
            async audit(item, mode) {
                console.log('审核单据: ',item);
                
                try{
                console.log('审核单据: ', item);

                try {
                    let res = await CommonUtils.doRequest2Sync({
                        method: 'GET',
                        url: '/QC_ProcessCheckBill/QC_ProcessCheckBillMainValue',
@@ -263,14 +265,18 @@
                            CurUserName: getUserInfo()["Czymc"]
                        }
                    })
                    
                    if(!res) {

                    if (!res) {
                        return
                    }
                    
                    let {count, data, Message} = res.data
                    
                    if(count == 1) {

                    let {
                        count,
                        data,
                        Message
                    } = res.data

                    if (count == 1) {
                        CommonUtils.showTips({
                            message: `${item["审核人"]?'反审核':'审核'}成功`
                        })
@@ -278,13 +284,13 @@
                        setTimeout(() => {
                            this.cmdSearch()
                        }, 2000)
                    }else {
                    } else {
                        CommonUtils.showTips({
                            title: '温馨提示',
                            message: `单据${item["审核人"]?'反审核':'审核'}失败: ${Message}`
                        })
                    }
                }catch(err) {
                } catch (err) {
                    CommonUtils.showTips({
                        title: '温馨提示',
                        message: `单据${item["审核人"]?'反审核':'审核'}错误: ${err}`
@@ -519,6 +525,7 @@
            margin-top: 20rpx;
            flex-wrap: wrap;
            align-content: flex-start;

            button {
                margin: 0;
                flex-shrink: 0;

 pages/ZLGL/shoujianjianyan/firstCheckBillList.vue

@@ -38,9 +38,9 @@
                <uni-card :title="item['单据号']" :extra="'日期:' + item['日期'].split('T')[0]"
                    @tap="showDetail = showDetail==index?-1:index">
                    <view class="card-detail">
                        <view class="detail" v-if="item['单据类型']">
                        <!-- <view class="detail" v-if="item['单据类型']">
                            <text>单据类型：</text>{{item['单据类型']}}
                        </view>
                        </view> -->
                        <view class="detail" v-if="item['单据状态']">
                            <text>单据状态：</text>{{item['单据状态']}}
                        </view>
@@ -59,8 +59,8 @@
                        <view class="detail" v-if="item['检验方案']">
                            <text>检验方案：</text>{{item['检验方案']}}
                        </view>
                        <view class="detail" v-if="item['规格型号']">
                            <text>规格型号：</text>{{item['规格型号']}}
                        <view class="detail" v-if="item['判定结论']">
                            <text>检验状态：</text>{{item['判定结论']}}
                        </view>
                    </view>
                    <view class="card-detail" v-if="showDetail == index">

 pages/ZLGL/xunjianjianyan/PatrolProcCheckBillList.vue

@@ -38,9 +38,9 @@
                <uni-card :title="item['单据号']" :extra="'日期:' + item['日期'].split('T')[0]"
                    @tap="showDetail = showDetail==index?-1:index">
                    <view class="card-detail">
                        <view class="detail" v-if="item['单据类型']">
                        <!-- <view class="detail" v-if="item['单据类型']">
                            <text>单据类型：</text>{{item['单据类型']}}
                        </view>
                        </view> -->
                        <view class="detail" v-if="item['单据状态']">
                            <text>单据状态：</text>{{item['单据状态']}}
                        </view>
@@ -59,8 +59,8 @@
                        <view class="detail" v-if="item['检验方案']">
                            <text>检验方案：</text>{{item['检验方案']}}
                        </view>
                        <view class="detail" v-if="item['规格型号']">
                            <text>规格型号：</text>{{item['规格型号']}}
                        <view class="detail" v-if="item['判定结论']">
                            <text>检验状态：</text>{{item['判定结论']}}
                        </view>
                    </view>
                    <view class="card-detail" v-if="showDetail == index">

 pages/baogong/DayPlanBillList.vue

@@ -14,7 +14,7 @@
                        <text>巡检次数：</text>{{currentOrder[0].巡检次数?currentOrder[0].巡检次数:0}}
                    </view>
                    <view class="detail">
                        <text>过程检次数：</text>{{currentOrder[0].过程检次数?currentOrder[0].过程检次数:0}}
                        <text>末检次数：</text>{{currentOrder[0].过程检次数?currentOrder[0].过程检次数:0}}
                    </view>
                    <view class="detail" v-if="currentOrder[0].当日点检完成情况">
                        <text>点检完成情况：</text>{{currentOrder[0].当日点检完成情况}}

 pages/index/login.vue

@@ -168,13 +168,13 @@
        methods: {
            async ApplyLanguagePack(lang, forceUpdate = false) {
                // 读取语言包并加载
                let {
                    data,
                    getRemoteFile
                } = await getLanguagePackJson(lang)
                if (getRemoteFile) {
                    this.$i18n.setLocaleMessage(lang, data)
                }
                // let {
                //     data,
                //     getRemoteFile
                // } = await getLanguagePackJson(lang)
                // if (getRemoteFile) {
                //     this.$i18n.setLocaleMessage(lang, data)
                // }
                this.$i18n.locale = lang
            },
            onLanguageChangeHandler(e) {