小程序

Mr.Zhang

2023-10-24 2a4c325293b3c738d6606cc5ee244a15e4dee0a3

小程序

 minipro_standard/common/config.js

@@ -1,9 +1,12 @@
module.exports = {

    // baseUrl: '/doumeeplant_api',

    // baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
    // https://lingyang.mes.show:1801/doumeeplant/doc.html

    // 测试

    baseUrl: 'https://dmtest.ahapp.net/doumeeplant_api',
    // 任康
    // baseUrl: 'http://192.168.0.129:10021/',
    // 羚羊 https://lingyang.mes.show:1801/doumeeplant/doc.html 
    // baseUrl: 'https://lingyang.mes.show:1801/doumeeplant',
    baseUrl: 'https://www.mes.red/doumeeplant',
    // mes
    // baseUrl: 'https://www.mes.red/doumeeplant',
    phoneRegular: /^1[3456789]\d{9}$/,

    mailboxRegular: /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,

    positiveInteger: /^[0-9]*[1-9][0-9]*$/,


 minipro_standard/pages_adjust/pages/OrderDetail/OrderDetail.vue

@@ -84,6 +84,17 @@
                        </div>

                    </div>

                </div>

                <!-- <div class="bg_list_item_h">
                    <div class="bg_list_item_num plr30">
                        <div class="bg_list_item_num_item">
                            <span>不良数{{ info.umodel ? `(${info.umodel.name})` : '' }}</span>
                            <div class="bg_list_item_num_item_sr">
                                <view class="mr10">{{ produceFrom.undesirable }}</view>
                                <span v-if="info.umodel">{{ info.umodel.name }}</span>
                            </div>
                        </div>
                    </div>
                </div> -->

            </div>
            <div class="bg_list_item">
                <div class="bg_list_item_top">
@@ -236,6 +247,7 @@
                let {duration, salaryNum, salaryTimes, qualifiedNum, unqualifiedNum, salaryUnqualified} = this.performance
                // 报工时长
                if (!duration) return 0;
                debugger
                // 报工数量
                if (!qualifiedNum && !unqualifiedNum) return 0;
                // 标准数量、时长
@@ -471,7 +483,6 @@
                getWorkorderRecordListStandard({

                    workorderId: this.workorderId

                }).then(res => {
                    debugger
                    // console.log(res.data[0]);
                    if (res.data.length > 0) {
                        this.produceFrom.qualified = res.data[0].qualifiedNum

 minipro_standard/pages_adjust/pages/workOrderReporting/workOrderReporting.vue

@@ -764,7 +764,8 @@
                    workorderId: this.workorderId,

                    duration: this.form.duration ? this.form.duration : 0,

                    qualifiedNum: this.produceFrom.qualified ? this.produceFrom.qualified : 0,

                    unQualifiedNum: this.produceFrom.undesirable ? this.produceFrom.undesirable : 0

                    unQualifiedNum: this.produceFrom.undesirable ? this.produceFrom.undesirable : 0,
                    type: this.form.type

                }

                // id: route.query.id

                comfirmDoneStandard({

@@ -1573,7 +1574,7 @@
        }

    }
    .content {
        height: 100vh;
        // height: 100vh;
        background-color: #f7f7f7;
    }

</style>

 web_standard/src/components/common/Header.vue

@@ -207,9 +207,11 @@
          let companyId = this.$store.state.userInfo.company.id
          this.setUserInfo(null)
          this.$cache.twoFA.removePassword()
          this.$router.push({ name: 'login', params: {
            companyId
          }})
          this.$store.commit('setCompanyId', companyId)
          window.location.reload()
          // this.$router.push({ name: 'login', params: {
          //   companyId
          // }})
        })
        .catch(e => {
          this.$tip.apiFailed(e)

 web_standard/src/views/login.vue

@@ -82,7 +82,8 @@
        uuid: this.captcha.uuid
      })
        .then(() => {
          window.location.href = process.env.VUE_APP_CONTEXT_PATH
          // window.location.href = process.env.VUE_APP_CONTEXT_PATH
          window.location.reload()
        })
        .catch(e => {
          this.refreshCaptcha()