chenhaozhe
2025-09-17 e4426d0821ff79bd93a52d3cee7b88cb1acbe0e2
Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
# manifest.json
3个文件已修改
13 ■■■■■ 已修改文件
manifest.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliao/table.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/shengchanlingliaoshengdan/table.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json
@@ -2,6 +2,7 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "1.0.80",
    "versionCode" : 180,
    "transformPx" : false,
pages/shengchanlingliao/table.vue
@@ -66,6 +66,12 @@
                    <view class="detail" v-if="item.物料名称">
                        <text>物料名称:</text>{{item.物料名称}}
                    </view>
                    <view class="detail" v-if="item.生产订单号">
                        <text>生产订单号:</text>{{item.生产订单号}}
                    </view>
                    <view class="detail" v-if="item.款号">
                        <text>款号:</text>{{item.款号}}
                    </view>
                    <view class="detail" v-if="item.规格型号">
                        <text>规格型号:</text>{{item.规格型号}}
                    </view>
pages/shengchanlingliaoshengdan/table.vue
@@ -84,6 +84,12 @@
                    <view class="detail" v-if="item.物料名称">
                        <text>物料名称:</text>{{item.物料名称}}
                    </view>
                    <view class="detail" v-if="item.生产订单号">
                        <text>生产订单号:</text>{{item.生产订单号}}
                    </view>
                    <view class="detail" v-if="item.款号">
                        <text>款号:</text>{{item.款号}}
                    </view>
                    <view class="detail" v-if="item.规格型号">
                        <text>规格型号:</text>{{item.规格型号}}
                    </view>