小小儁爺
2024-10-24 631d7e345da5ff57055c9a4787a088749baa79d9
1.沣沣 模具模块优化
已修改9个文件
56 ■■■■■ 文件已修改
main.js 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mjgl/mjby2.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mjgl/mjdj2.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mjgl/mjrk2.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mjgl/mjsj2.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/mjgl/wxsq2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/scgl/scbg.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/wwgl/wxfl.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/wwgl/wxsl.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
main.js
@@ -18,12 +18,12 @@
    ...App
})
Vue.prototype.$appVersion = 'v1.0.2' //APP当前版本
Vue.prototype.$appVersion = 'v1.0.3' //APP当前版本
// Vue.prototype.$baseUrl = 'http://121.196.36.24:8021/api' //本地产品   巨力的数据库
// Vue.prototype.$baseUrl = 'http://122.227.18.22:8000/api' //本地产品   巨立防护(客户地址)
// Vue.prototype.$baseUrl = 'http://121.196.36.24:8032/api' //圣沣项目
// Vue.prototype.$baseUrl = 'http://121.196.36.24:8019/api' //圣沣
Vue.prototype.$baseUrl = 'http://192.168.2.254:8000/api' //圣沣项目      客户现场实际服务器ip
// Vue.prototype.$baseUrl = 'http://121.196.36.24:8019/api' //
Vue.prototype.$baseUrl = 'http://121.196.36.24:8032/api' //圣沣项目
// Vue.prototype.$baseUrl = 'http://192.168.2.254:8000/api' //圣沣项目      客户现场实际服务器ip
Vue.prototype.$companyType = 'B' //企业类型(项目类型) A:巨力,B:圣沣,、B: 产品
// A:  http://121.196.36.24:8021/api  http://122.227.18.22:8000/api
pages/mjgl/mjby2.vue
@@ -369,4 +369,9 @@
    ::v-deep .uicon-arrow-left>span {
        display: block;
    }
    ::v-deep .u-action-sheet {
        height: 800rpx;
        overflow-y: auto;
    }
</style>
pages/mjgl/mjdj2.vue
@@ -370,4 +370,9 @@
    ::v-deep .uicon-arrow-left>span {
        display: block;
    }
    ::v-deep .u-action-sheet {
        height: 800rpx;
        overflow-y: auto;
    }
</style>
pages/mjgl/mjrk2.vue
@@ -410,4 +410,9 @@
        overflow: auto;
        max-height: 50vh;
    }
    ::v-deep .u-action-sheet {
        height: 800rpx;
        overflow-y: auto;
    }
</style>
pages/mjgl/mjsj2.vue
@@ -292,4 +292,9 @@
    ::v-deep .uicon-arrow-left>span {
        display: block;
    }
    ::v-deep .u-action-sheet {
        height: 800rpx;
        overflow-y: auto;
    }
</style>
pages/mjgl/wxsq2.vue
@@ -363,7 +363,7 @@
                    faultdescr: this.descMessage,
                }
                // console.log(JSON.stringify(formData))
                console.log(JSON.stringify(formData))
                this.isDisabledSubmitButton = true
                uni.uploadFile({
                    url: this.$baseUrl + '/MouldManager/MaintainScanMouldApplySave',
pages/scgl/scbg.vue
@@ -43,12 +43,12 @@
        <u-collapse style="max-height: 590px;overflow: auto;">
            <!-- :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)' -->
            <u-collapse-item style="position: relative;" :title="item.ordercode" :name='item.ordercode'
                :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
                v-if='item.children.length!==0' :value='parseFloat(item.ordergoodqty)+"/"+parseFloat(item.orderqty)'
                :label="item.children.length===0?'未派发':''" :disabled='item.children.length===0'
                v-for="item in collapseArr" :key="item.ordercode">
                <view style="position: absolute;width: 200rpx;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
                <view style="position: absolute;left: 30rpx;top:34px;font-size: 24rpx;color: #999;">
                    {{item.partname}} {{item.partspec}}
                </view>
@@ -128,8 +128,8 @@
        <!-- closeIconPos='top-left' closeOnClickOverlay  closeable='true' -->
        <u-popup :show="popupShow" mode="right" @close="popupClose" @open="popupOpen">
            <view style="margin: 120px 10px 20px;" class="flex_column">
                <!--         <view style="display: flex;">
                <!--
                <view style="display: flex;">
                    <view>
                        单据类型:
                    </view>
@@ -162,7 +162,7 @@
                <!--     <view class="head" style="margin-top: 10px;">
                <view class="head" style="margin-top: 10px;">
                    <view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
                        <u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
                            type="primary" shape="circle" text="今日">
@@ -186,9 +186,9 @@
                    <u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
                        :text="calendarRange">
                    </u-button>
                </view> -->
                </view>
                <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
                <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
            </view>
        </u-popup>
pages/wwgl/wxfl.vue
@@ -162,7 +162,7 @@
                <!--     <view class="head" style="margin-top: 10px;">
                <view class="head" style="margin-top: 10px;">
                    <view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
                        <u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
                            type="primary" shape="circle" text="今日">
@@ -186,9 +186,9 @@
                    <u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
                        :text="calendarRange">
                    </u-button>
                </view> -->
                </view>
                <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
                <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
            </view>
        </u-popup>
pages/wwgl/wxsl.vue
@@ -162,7 +162,7 @@
                <!--     <view class="head" style="margin-top: 10px;">
                <view class="head" style="margin-top: 10px;">
                    <view class="head_block" style="height: 80rpx; display: flex;justify-content: space-around;">
                        <u-button :plain='today' style="width: 70px;height: 25px;" @click="dateChange('today')"
                            type="primary" shape="circle" text="今日">
@@ -186,9 +186,9 @@
                    <u-button type="info" icon='calendar' iconColor="#0659FF" size="" @click="calendarClick"
                        :text="calendarRange">
                    </u-button>
                </view> -->
                </view>
                <!-- <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" /> -->
                <uni-calendar ref="calendar" :range='true' :insert="false" @confirm="calendarConfirm" />
            </view>
        </u-popup>