From 6b583a85909ba658440986fb3367f06be1fb2c61 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Sat, 15 Mar 2025 01:54:03 +0800
Subject: [PATCH] 1

---
 admin-web-master/dist (2).zip                          | Bin 5955188 -> 0 bytes
 admin-web-master/dist.zip                              | Bin 0 -> 5945294 bytes
 admin-web-master/src/components/add/addinformation.vue |  5 +++++
 admin-web-master/src/utils/request.js                  |  3 ++-
 admin-web-master/src/views/shopRental/manage/index.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 lvdao-miniapp/pages/orderList/aftersale.vue            | 11 ++++++-----
 lvdao-miniapp/pages/orderList/inventory.vue            | 17 +++++++++--------
 lvdao-miniapp/pages/orderList/inventorydetails.vue     |  2 +-
 lvdao-miniapp/pages/orderList/orderList.vue            | 13 ++++++++-----
 lvdao-miniapp/pages/workbench/workbench.vue            | 17 ++++++++++++++++-
 10 files changed, 99 insertions(+), 27 deletions(-)
 delete mode 100644 admin-web-master/dist (2).zip
 create mode 100644 admin-web-master/dist.zip

diff --git a/admin-web-master/dist (2).zip b/admin-web-master/dist (2).zip
deleted file mode 100644
index bcd6a94..0000000
Binary files a/admin-web-master/dist (2).zip and /dev/null differ
diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
new file mode 100644
index 0000000..a2af4bd
Binary files /dev/null and b/admin-web-master/dist.zip differ
diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue
index f48bc61..00b1a94 100644
--- a/admin-web-master/src/components/add/addinformation.vue
+++ b/admin-web-master/src/components/add/addinformation.vue
@@ -241,6 +241,11 @@
             message: '请地图标点选择位置',
             trigger: 'blur'
           }, ],
+          propertyArea: [{
+            required: true,
+            message: '请填写产权面积',
+            trigger: 'blur'
+          }, ],
           mapPunctuation: [{
             required: true,
             message: '请选择地图标点',
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index a4beb40..b4f25b2 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,7 +16,8 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
   // baseURL = 'http://128.10.249.46:9003';
diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue
index 890f0d1..d8e74b7 100644
--- a/admin-web-master/src/views/shopRental/manage/index.vue
+++ b/admin-web-master/src/views/shopRental/manage/index.vue
@@ -97,8 +97,8 @@
           <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <!-- v-if='scope.row.dataStatus == 4' -->
-              <div  @click="OA(scope.row)" class="tableBtn greens">OA</div>
+              <!--  -->
+              <div v-if='scope.row.dataStatus == 4'  @click="openOAitem(scope.row)" class="tableBtn greens">OA</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
               <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
@@ -159,6 +159,22 @@
         <add :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction"></add>
       </div>
     </div>
+    <el-dialog :visible.sync="openoa" title="OA" width="65%" append-to-body center :close-on-click-modal="false"
+      :close-on-press-escape="false" :show-close="false">
+      <el-form v-if="openoa"  style="padding-right: 50px;padding-top: 20px;" :model="ruleForm" :rules="rulesoa" ref="oaForm" label-width="130px" class="demo-ruleForm">
+        <el-form-item label="审核人" prop="reviewers">
+          <el-select v-model="ruleForm.reviewers" placeholder="请选择" style="width: 100%;">
+            <el-option label="陈阳" value="1858710592190291968"></el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div style="display: flex; justify-content: flex-end; align-items: center;padding: 20px 50px;">
+        <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+        <el-button @click="openoa =false" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+      </div>
+    </el-dialog>
   </div>
 
 
@@ -182,6 +198,17 @@
   export default {
     data() {
       return {
+        rulesoa: {
+          reviewers: [{
+            required: true,
+            message: '请选择审核人',
+            trigger: 'blur'
+          }, ],
+        },
+        ruleForm:{
+          reviewers:""
+        },
+        openoa:false,
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
@@ -194,6 +221,7 @@
         total: 0,
         onaction: '1',
         formInline: {},
+        oainfo:{}
       }
     },
     components: {
@@ -205,6 +233,11 @@
       this.getAll()
     },
     methods: {
+      openOAitem(row){
+        this.oainfo = row
+        this.ruleForm.reviewers = ''
+        this.openoa = true
+      },
        downloadBase64File(base64String, fileName, mimeType) {
         try {
           // 将 Base64 字符串解码为二进制数据
@@ -235,9 +268,20 @@
           console.error('文件下载失败:', error);
         }
       },
-      async OA(row){
+      async OA(){
         // console.error(row)
-        // return
+        let row = this.oainfo
+        await this.$refs.oaForm.validate((valid) => {
+          
+        })
+    
+        if(!this.ruleForm.reviewers) {
+          return
+        }
+        const loading = this.$loading({
+          fullscreen: true
+        })
+        this.openoa = false
         console.log(this.$baseURL+row.appendicesContract)
         const response = await axios({
           method: 'get',
@@ -255,9 +299,9 @@
         console.log(file);
         let fd = new FormData();
         fd.append('files', file); // 假设 formData 包含文件
-        fd.append('reviewers', '1858710592190291968');
+        fd.append('reviewers', this.ruleForm.reviewers);
         fd.append('fileNames', '合同.docx');
-        fd.append('title', '这是一个流程');
+        fd.append('title', '合同审批');
         fd.append('contractNumber', row.contractNumber);
         console.log(fd);
         // return
@@ -277,6 +321,8 @@
               type: 'success',
               message: '发起成功'
             })
+            loading.close();
+            this.resetting()
             // edit({
             //   contractNumber: row.contractNumber,
             // dataStatus: '5',
diff --git a/lvdao-miniapp/pages/orderList/aftersale.vue b/lvdao-miniapp/pages/orderList/aftersale.vue
index c3f6e8a..96729de 100644
--- a/lvdao-miniapp/pages/orderList/aftersale.vue
+++ b/lvdao-miniapp/pages/orderList/aftersale.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
 		<u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs>
+		<view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<view style="padding: 0 20rpx;">
 			<view v-for="(item,index) in alllist" :key="index"
 				@click="gopath('/pages/orderList/aftersaledetails',item.afterId)"
@@ -82,11 +83,11 @@
 		},
 		onLoad(optiong) {
 			this.imgurl = this.$img
-			this.getALL()
-			// this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
-			// 	//成功回调	
-			// 	this.list = res.data.data.list
-			// })
+			if(uni.getStorageSync('shopId')) {
+				this.getALL()
+			} else {
+				
+			}
 		},
 		onReachBottom(e) {
 			console.error(e)
diff --git a/lvdao-miniapp/pages/orderList/inventory.vue b/lvdao-miniapp/pages/orderList/inventory.vue
index 53b803d..6bc21d5 100644
--- a/lvdao-miniapp/pages/orderList/inventory.vue
+++ b/lvdao-miniapp/pages/orderList/inventory.vue
@@ -1,5 +1,6 @@
 <template>
 	<view class="page">
+		<view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<!-- <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> -->
 		<view style="padding: 0 20rpx;">
 			<view v-for="(item,index) in alllist" :key="index"   @click="gopath('/pages/orderList/inventorydetails',item.orderId)"
@@ -74,11 +75,11 @@
 		},
 		onLoad(optiong) {
 			this.imgurl = this.$img
-			this.getALL()
-			// this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
-			// 	//成功回调	
-			// 	this.list = res.data.data.list
-			// })
+			if(uni.getStorageSync('shopId')) {
+				this.getALL()
+			} else {
+				
+			}
 		},
 		onReachBottom (e){
 			console.error(e)
@@ -89,9 +90,9 @@
 		},
 		methods: {
 			gopath(url,id){
-				// uni.navigateTo({
-				// 	url:url+'?id='+id
-				// })
+				uni.navigateTo({
+					url:url+'?id='+id
+				})
 			},
 			getALL() {
 				this.$http.sendRequest('/product/getAll', 'POST', this.pageindex,2).then(res => {
diff --git a/lvdao-miniapp/pages/orderList/inventorydetails.vue b/lvdao-miniapp/pages/orderList/inventorydetails.vue
index b9a982e..b1c833b 100644
--- a/lvdao-miniapp/pages/orderList/inventorydetails.vue
+++ b/lvdao-miniapp/pages/orderList/inventorydetails.vue
@@ -129,7 +129,7 @@
 			console.log(options)
 			this.$http.sendRequest('/product/getById', 'POST', {
 				orderId: options.id
-			}, 1).then(res => {
+			}, 2).then(res => {
 				this.dataList = res.data.data
 			})
 			return
diff --git a/lvdao-miniapp/pages/orderList/orderList.vue b/lvdao-miniapp/pages/orderList/orderList.vue
index 9bc30d2..70673e0 100644
--- a/lvdao-miniapp/pages/orderList/orderList.vue
+++ b/lvdao-miniapp/pages/orderList/orderList.vue
@@ -1,6 +1,7 @@
 <template>
 	<view class="page">
 		<u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs>
+		<view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
 		<view style="padding: 0 20rpx;">
 			<view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/orderListdetails',item.orderId)"
 				style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
@@ -95,11 +96,13 @@
 		},
 		onLoad(optiong) {
 			this.imgurl = this.$img
-			this.getALL()
-			// this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => {
-			// 	//成功回调	
-			// 	this.list = res.data.data.list
-			// })
+			if(uni.getStorageSync('shopId')) {
+				this.getALL()
+			} else {
+				
+			}
+			
+			
 		},
 		onReachBottom (e){
 			console.error(e)
diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue
index 9957a80..9857ffb 100644
--- a/lvdao-miniapp/pages/workbench/workbench.vue
+++ b/lvdao-miniapp/pages/workbench/workbench.vue
@@ -70,7 +70,7 @@
 					<view class="bidding-title-line"></view>{{item.title}}
 				</view>
 				<view class="wallet-info">
-					<view class="list" v-for="v in item.children" :key="v.name" @click="toPath(v.path)">
+					<view class="list" v-for="v in item.children" :key="v.name" @click="toPath1(v.path)">
 						<view class="icon">
 							<image :src="$imgUrl(`${v.img}`)"></image>
 						</view>
@@ -302,6 +302,21 @@ pageList6: [{
 			this.scrollTop = e.scrollTop;
 		},
 		methods: {
+			async toPath1(path) {
+				// let c1 = uni.getStorageSync('user').phone
+				let c1 = '18188305496'
+				await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => {
+					if(res.data.data.list.length>0) {
+						uni.setStorageSync('shopId', res.data.data.list[0].shopId);
+					} else {
+						// uni.show
+						uni.setStorageSync('shopId', '');
+					}
+				})
+				uni.navigateTo({
+					url: path,
+				})
+			},
 			toPath(path) {
 				uni.navigateTo({
 					url: path,
--
libgit2 0.21.4