瀏覽代碼

更新 sdy

zhongtianhaoyuan 3 年之前
父節點
當前提交
ba82447b70

+ 1 - 1
src/views/houseSelfCollect/inspectInfo.vue

@@ -148,7 +148,7 @@
           </ws-info-table>
           </ws-info-table>
           <div class="but">
           <div class="but">
             <el-button @click="cancel" v-if="types != 2" type="primary">取消</el-button>
             <el-button @click="cancel" v-if="types != 2" type="primary">取消</el-button>
-               <el-button @click="checkOk" v-if="types ==3 || types == 4" type="primary">确认初检信息</el-button>
+               <el-button @click="checkOk" v-if="types == 4" type="primary">确认初检信息</el-button>
             <el-button @click="print" v-if="types ==3 || types ==1" type="primary">保存
             <el-button @click="print" v-if="types ==3 || types ==1" type="primary">保存
             </el-button>
             </el-button>
             <el-button @click="print" v-if="types == 5 || types==4" type="primary">确认并打印</el-button>
             <el-button @click="print" v-if="types == 5 || types==4" type="primary">确认并打印</el-button>

+ 5 - 1
src/views/houseSelfCollect/inspectionManagement.vue

@@ -169,6 +169,11 @@
 		},
 		},
 		activated() {
 		activated() {
 			this.selectWarehouse()
 			this.selectWarehouse()
+			let _WarehouseName = localStorage.getItem('houseSelfCollect_house1')
+			_WarehouseName = JSON.parse(_WarehouseName)
+			if(_WarehouseName){
+				this.warehouseNameChange(_WarehouseName.value)
+			}
 		},
 		},
 		methods: {
 		methods: {
 			printSmall() {
 			printSmall() {
@@ -209,7 +214,6 @@
 				})
 				})
 			},
 			},
 			warehouseNameChange(e) {
 			warehouseNameChange(e) {
-				// console.log(e)
 				for (let i = 0; i < this.warehouseList.length; i++) {
 				for (let i = 0; i < this.warehouseList.length; i++) {
 					if (this.warehouseList[i].value == e) {
 					if (this.warehouseList[i].value == e) {
 						this.warehouseName = this.warehouseList[i].value
 						this.warehouseName = this.warehouseList[i].value

+ 1 - 2
src/views/houseSelfCollect/paymentManagement.vue

@@ -1404,8 +1404,7 @@ export default {
       for (let i = 0; i < this.warehouseList.length; i++) {
       for (let i = 0; i < this.warehouseList.length; i++) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
         if (this.warehouseList[i].id == this.warehouseNameKey) {
           this.warehouseName = this.warehouseList[i].warehouseName
           this.warehouseName = this.warehouseList[i].warehouseName
-          localStorage.setItem(
-            'houseSelfCollect_house1',
+          localStorage.setItem( 'houseSelfCollect_house1',
             JSON.stringify({
             JSON.stringify({
               value: this.warehouseList[i].warehouseName,
               value: this.warehouseList[i].warehouseName,
               warehouseId: this.warehouseList[i].id,
               warehouseId: this.warehouseList[i].id,