~jhz/STUWMS.git

parent: 76b2d677 | 补丁 | 提交 | show whitespace

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

zrg

2025-10-22 e7f5eb2fef604010199be69a54c21e9b2ac23287

Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

# Conflicts:
#	pages/index/login.vue

7个文件已修改

	manifest.json	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/caigouruku/form.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/caigoutuiliao/form.vue	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/index/login.vue	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/shengchantuiliao/form.vue	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/xiaoshouchuku/form.vue	11 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	pages/xiaoshoutuihuo/form.vue	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 manifest.json

@@ -2,8 +2,8 @@
    "name" : "智云LMES",
    "appid" : "__UNI__B002F49",
    "description" : "",
    "versionName" : "2.0.3",
    "versionCode" : 203,
    "versionName" : "2.0.4",
    "versionCode" : 204,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {

 pages/caigouruku/form.vue

@@ -187,6 +187,10 @@
                            <view class="detail" v-if="item.单价">
                                <text>单价：</text>{{item.单价}}
                            </view>
                            <view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
                            )">
                                <text>仓库：</text>{{materMeta[0].HWHName}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -1443,6 +1447,13 @@
                            var data = res.data.data
                            this.materMeta = data.BarCodeDetailslist
                            this.Materlist = data.Materlist

                            if (/兴达/.test(uni.getStorageSync("Organization"))) {
                                // 兴达客户 带出 仓库
                                console.log("兴达带出默认仓库")
                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
                            }

                            if (!data.BarCodeDetailslist[0].HBarCode) {
                                this.hform.HMaterName_B = ''
                                this.hform.HMaterModel_B = ''

 pages/caigoutuiliao/form.vue

@@ -174,6 +174,12 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            
                            <!-- 兴达客户 功能 -->
                            <view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
                            )">
                                <text>仓库：</text>{{materMeta[0].HWHName}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -302,6 +308,8 @@
                btnType: 0, //0新增，1修改，2审核，3反审核
                showmore: false,


                materMeta: [],
                arrayHWHName: [], //仓库
                HWHNameList: [],
                arrayHStockPlaceName: [], //仓位
@@ -1383,7 +1391,15 @@
                        console.log('物料', res.data)
                        if (res.data.count == 1) {
                            var data = res.data.data
                            this.materMeta = data.BarCodeDetailslist
                            this.Materlist = data.Materlist
                            if (/兴达/.test(uni.getStorageSync("Organization"))) {
                                // 兴达客户 带出 仓库
                                console.log("兴达带出默认仓库")
                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
                            }
                            
                            
                            if (!data.BarCodeDetailslist[0].HBarCode) {
                                this.hform.HMaterName_B = ''
                                this.hform.HMaterModel_B = ''

 pages/index/login.vue

@@ -85,7 +85,8 @@
                    "温州海诚光学": 'http://122.228.39.234:7177/API/',
                    "宁波惠康工业": 'http://172.16.72.30:6699/API/',
                    "余姚兴达起动器": 'http://121.37.133.104/API/',
                    "翁涛涛本地测试": 'http://localhost:8082/API/'
                    "翁涛涛本地测试": 'http://localhost:81/API/',
                    "苏州卫智科技": 'http://221.224.60.42:8082/API_WW/',
                },
                serverUrlName: '浙江智云迈思',


 pages/shengchantuiliao/form.vue

@@ -353,10 +353,14 @@

                    HBarCode: '',
                    HQty: '',
                    HWHName: getUserInfo().HWHName,
                    HWHID: getUserInfo().HWhID,
                    HStockPlaceName: getUserInfo().HSPName,
                    HStockPlaceID: getUserInfo().HSPID,
                    // HWHName: getUserInfo().HWHName,
                    // HWHID: getUserInfo().HWhID,
                    // HStockPlaceName: getUserInfo().HSPName,
                    // HStockPlaceID: getUserInfo().HSPID,
                    HWHName: '',
                    HWHID: 0,
                    HStockPlaceName: '',
                    HStockPlaceID: 0,

                    HMainSourceBillType: 3720,
                    HSourceBillNo: '', //CGDD000200

 pages/xiaoshouchuku/form.vue

@@ -187,6 +187,11 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            <!-- 兴达客户 功能 -->
                            <view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
                            )">
                                <text>仓库：</text>{{materMeta[0].HWHName}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -1435,6 +1440,12 @@
                            var data = res.data.data
                            this.materMeta = data.BarCodeDetailslist
                            this.Materlist = data.Materlist
                            if (/兴达/.test(uni.getStorageSync("Organization"))) {
                                // 兴达客户 带出 仓库
                                console.log("兴达带出默认仓库")
                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
                            }

                            if (data.FIFOlist.length != 0) {
                                if (data.FIFOlist[0].HMaterID != 0) {
                                    this.FIFOlist = data.FIFOlist

 pages/xiaoshoutuihuo/form.vue

@@ -165,6 +165,12 @@
                            <view class="detail" v-if="item.辅助属性">
                                <text>辅助属性：</text>{{item.辅助属性}}
                            </view>
                            
                            <!-- 兴达客户 功能 -->
                            <view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
                            )">
                                <text>仓库：</text>{{materMeta[0].HWHName}}
                            </view>
                        </view>
                    </uni-card>
                </view>
@@ -304,6 +310,7 @@
                HSupNameList: [],

                Materlist: [],
                materMeta: [],
                hform: {
                    HBillType: 1247,
                    HBillerID: uni.getStorageSync('HBillerID'),
@@ -1242,7 +1249,14 @@
                        console.log('物料', res.data)
                        if (res.data.count == 1) {
                            var data = res.data.data
                            this.materMeta = data.BarCodeDetailslist
                            this.Materlist = data.Materlist
                            
                            if (/兴达/.test(uni.getStorageSync("Organization"))) {
                                // 兴达客户 带出 仓库
                                console.log("兴达带出默认仓库")
                                this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
                            }
                            if (!data.BarCodeDetailslist[0].HBarCode) {
                                this.hform.HMaterName_B = ''
                                this.hform.HMaterModel_B = ''

			@@ -2,8 +2,8 @@
			"name" : "智云LMES",
			"appid" : "__UNI__B002F49",
			"description" : "",
			"versionName" : "2.0.3",
			"versionCode" : 203,
			"versionName" : "2.0.4",
			"versionCode" : 204,
			"transformPx" : false,
			/* 5+App特有相关 */
			"app-plus" : {

			@@ -187,6 +187,10 @@
			<view class="detail" v-if="item.单价">
			<text>单价：</text>{{item.单价}}
			</view>
			<view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
			)">
			<text>仓库：</text>{{materMeta[0].HWHName}}
			</view>
			</view>
			</uni-card>
			</view>
			@@ -1443,6 +1447,13 @@
			var data = res.data.data
			this.materMeta = data.BarCodeDetailslist
			this.Materlist = data.Materlist

			if (/兴达/.test(uni.getStorageSync("Organization"))) {
			// 兴达客户带出仓库
			console.log("兴达带出默认仓库")
			this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
			}

			if (!data.BarCodeDetailslist[0].HBarCode) {
			this.hform.HMaterName_B = ''
			this.hform.HMaterModel_B = ''

			@@ -174,6 +174,12 @@
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>

			<!-- 兴达客户功能 -->
			<view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
			)">
			<text>仓库：</text>{{materMeta[0].HWHName}}
			</view>
			</view>
			</uni-card>
			</view>
			@@ -302,6 +308,8 @@
			btnType: 0, //0新增，1修改，2审核，3反审核
			showmore: false,


			materMeta: [],
			arrayHWHName: [], //仓库
			HWHNameList: [],
			arrayHStockPlaceName: [], //仓位
			@@ -1383,7 +1391,15 @@
			console.log('物料', res.data)
			if (res.data.count == 1) {
			var data = res.data.data
			this.materMeta = data.BarCodeDetailslist
			this.Materlist = data.Materlist
			if (/兴达/.test(uni.getStorageSync("Organization"))) {
			// 兴达客户带出仓库
			console.log("兴达带出默认仓库")
			this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
			}


			if (!data.BarCodeDetailslist[0].HBarCode) {
			this.hform.HMaterName_B = ''
			this.hform.HMaterModel_B = ''

			@@ -85,7 +85,8 @@
			"温州海诚光学": 'http://122.228.39.234:7177/API/',
			"宁波惠康工业": 'http://172.16.72.30:6699/API/',
			"余姚兴达起动器": 'http://121.37.133.104/API/',
			"翁涛涛本地测试": 'http://localhost:8082/API/'
			"翁涛涛本地测试": 'http://localhost:81/API/',
			"苏州卫智科技": 'http://221.224.60.42:8082/API_WW/',
			},
			serverUrlName: '浙江智云迈思',

			@@ -353,10 +353,14 @@

			HBarCode: '',
			HQty: '',
			HWHName: getUserInfo().HWHName,
			HWHID: getUserInfo().HWhID,
			HStockPlaceName: getUserInfo().HSPName,
			HStockPlaceID: getUserInfo().HSPID,
			// HWHName: getUserInfo().HWHName,
			// HWHID: getUserInfo().HWhID,
			// HStockPlaceName: getUserInfo().HSPName,
			// HStockPlaceID: getUserInfo().HSPID,
			HWHName: '',
			HWHID: 0,
			HStockPlaceName: '',
			HStockPlaceID: 0,

			HMainSourceBillType: 3720,
			HSourceBillNo: '', //CGDD000200

			@@ -187,6 +187,11 @@
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>
			<!-- 兴达客户功能 -->
			<view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
			)">
			<text>仓库：</text>{{materMeta[0].HWHName}}
			</view>
			</view>
			</uni-card>
			</view>
			@@ -1435,6 +1440,12 @@
			var data = res.data.data
			this.materMeta = data.BarCodeDetailslist
			this.Materlist = data.Materlist
			if (/兴达/.test(uni.getStorageSync("Organization"))) {
			// 兴达客户带出仓库
			console.log("兴达带出默认仓库")
			this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
			}

			if (data.FIFOlist.length != 0) {
			if (data.FIFOlist[0].HMaterID != 0) {
			this.FIFOlist = data.FIFOlist

			@@ -165,6 +165,12 @@
			<view class="detail" v-if="item.辅助属性">
			<text>辅助属性：</text>{{item.辅助属性}}
			</view>

			<!-- 兴达客户功能 -->
			<view class="detail" v-if="materMeta[0].HWHName && /兴达/.test(hform.HStockOrgName
			)">
			<text>仓库：</text>{{materMeta[0].HWHName}}
			</view>
			</view>
			</uni-card>
			</view>
			@@ -304,6 +310,7 @@
			HSupNameList: [],

			Materlist: [],
			materMeta: [],
			hform: {
			HBillType: 1247,
			HBillerID: uni.getStorageSync('HBillerID'),
			@@ -1242,7 +1249,14 @@
			console.log('物料', res.data)
			if (res.data.count == 1) {
			var data = res.data.data
			this.materMeta = data.BarCodeDetailslist
			this.Materlist = data.Materlist

			if (/兴达/.test(uni.getStorageSync("Organization"))) {
			// 兴达客户带出仓库
			console.log("兴达带出默认仓库")
			this.HWHNameChange(data.BarCodeDetailslist[0].HWHName)
			}
			if (!data.BarCodeDetailslist[0].HBarCode) {
			this.hform.HMaterName_B = ''
			this.hform.HMaterModel_B = ''