Commit c69d6cf43f6ecde6c183eb8e810e963584d2eb31
'最新'
Showing
9 changed files
with
98 additions
and
27 deletions
admin-web-master/src/components/add/addinformation.vue
admin-web-master/src/views/shopRental/manage/index.vue
| ... | ... | @@ -97,8 +97,8 @@ |
| 97 | 97 | <el-table-column label="操作" min-width="150" fixed="right"> |
| 98 | 98 | <template slot-scope="scope"> |
| 99 | 99 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> |
| 100 | - <!-- v-if='scope.row.dataStatus == 4' --> | |
| 101 | - <div @click="OA(scope.row)" class="tableBtn greens">OA</div> | |
| 100 | + <!-- --> | |
| 101 | + <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA</div> | |
| 102 | 102 | <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div> |
| 103 | 103 | <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div> |
| 104 | 104 | <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div> |
| ... | ... | @@ -159,6 +159,22 @@ |
| 159 | 159 | <add :info="detailsinfo" :contractChangeReason="contractChangeReason" @removeonaction="removeonaction"></add> |
| 160 | 160 | </div> |
| 161 | 161 | </div> |
| 162 | + <el-dialog :visible.sync="openoa" title="OA" width="65%" append-to-body center :close-on-click-modal="false" | |
| 163 | + :close-on-press-escape="false" :show-close="false"> | |
| 164 | + <el-form v-if="openoa" style="padding-right: 50px;padding-top: 20px;" :model="ruleForm" :rules="rulesoa" ref="oaForm" label-width="130px" class="demo-ruleForm"> | |
| 165 | + <el-form-item label="审核人" prop="reviewers"> | |
| 166 | + <el-select v-model="ruleForm.reviewers" placeholder="请选择" style="width: 100%;"> | |
| 167 | + <el-option label="陈阳" value="1858710592190291968"></el-option> | |
| 168 | + </el-select> | |
| 169 | + </el-form-item> | |
| 170 | + | |
| 171 | + </el-form> | |
| 172 | + <div style="display: flex; justify-content: flex-end; align-items: center;padding: 20px 50px;"> | |
| 173 | + <el-button @click="OA" style="background-color: #3F9B6A;color: #fff;">确定</el-button> | |
| 174 | + <el-button @click="openoa =false" class="buttonHover" | |
| 175 | + style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button> | |
| 176 | + </div> | |
| 177 | + </el-dialog> | |
| 162 | 178 | </div> |
| 163 | 179 | |
| 164 | 180 | |
| ... | ... | @@ -182,6 +198,17 @@ |
| 182 | 198 | export default { |
| 183 | 199 | data() { |
| 184 | 200 | return { |
| 201 | + rulesoa: { | |
| 202 | + reviewers: [{ | |
| 203 | + required: true, | |
| 204 | + message: '请选择审核人', | |
| 205 | + trigger: 'blur' | |
| 206 | + }, ], | |
| 207 | + }, | |
| 208 | + ruleForm:{ | |
| 209 | + reviewers:"" | |
| 210 | + }, | |
| 211 | + openoa:false, | |
| 185 | 212 | contractChangeReason: '', |
| 186 | 213 | detailsinfo: {}, |
| 187 | 214 | pagequery: { |
| ... | ... | @@ -194,6 +221,7 @@ |
| 194 | 221 | total: 0, |
| 195 | 222 | onaction: '1', |
| 196 | 223 | formInline: {}, |
| 224 | + oainfo:{} | |
| 197 | 225 | } |
| 198 | 226 | }, |
| 199 | 227 | components: { |
| ... | ... | @@ -205,6 +233,11 @@ |
| 205 | 233 | this.getAll() |
| 206 | 234 | }, |
| 207 | 235 | methods: { |
| 236 | + openOAitem(row){ | |
| 237 | + this.oainfo = row | |
| 238 | + this.ruleForm.reviewers = '' | |
| 239 | + this.openoa = true | |
| 240 | + }, | |
| 208 | 241 | downloadBase64File(base64String, fileName, mimeType) { |
| 209 | 242 | try { |
| 210 | 243 | // 将 Base64 字符串解码为二进制数据 |
| ... | ... | @@ -235,9 +268,20 @@ |
| 235 | 268 | console.error('文件下载失败:', error); |
| 236 | 269 | } |
| 237 | 270 | }, |
| 238 | - async OA(row){ | |
| 271 | + async OA(){ | |
| 239 | 272 | // console.error(row) |
| 240 | - // return | |
| 273 | + let row = this.oainfo | |
| 274 | + await this.$refs.oaForm.validate((valid) => { | |
| 275 | + | |
| 276 | + }) | |
| 277 | + | |
| 278 | + if(!this.ruleForm.reviewers) { | |
| 279 | + return | |
| 280 | + } | |
| 281 | + const loading = this.$loading({ | |
| 282 | + fullscreen: true | |
| 283 | + }) | |
| 284 | + this.openoa = false | |
| 241 | 285 | console.log(this.$baseURL+row.appendicesContract) |
| 242 | 286 | const response = await axios({ |
| 243 | 287 | method: 'get', |
| ... | ... | @@ -255,9 +299,9 @@ |
| 255 | 299 | console.log(file); |
| 256 | 300 | let fd = new FormData(); |
| 257 | 301 | fd.append('files', file); // 假设 formData 包含文件 |
| 258 | - fd.append('reviewers', '1858710592190291968'); | |
| 302 | + fd.append('reviewers', this.ruleForm.reviewers); | |
| 259 | 303 | fd.append('fileNames', '合同.docx'); |
| 260 | - fd.append('title', '这是一个流程'); | |
| 304 | + fd.append('title', '合同审批'); | |
| 261 | 305 | fd.append('contractNumber', row.contractNumber); |
| 262 | 306 | console.log(fd); |
| 263 | 307 | // return |
| ... | ... | @@ -277,6 +321,8 @@ |
| 277 | 321 | type: 'success', |
| 278 | 322 | message: '发起成功' |
| 279 | 323 | }) |
| 324 | + loading.close(); | |
| 325 | + this.resetting() | |
| 280 | 326 | // edit({ |
| 281 | 327 | // contractNumber: row.contractNumber, |
| 282 | 328 | // dataStatus: '5', | ... | ... |
lvdao-miniapp/manifest.json
lvdao-miniapp/pages/orderList/aftersale.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="page"> |
| 3 | 3 | <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> |
| 4 | + <view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view> | |
| 4 | 5 | <view style="padding: 0 20rpx;"> |
| 5 | 6 | <view v-for="(item,index) in alllist" :key="index" |
| 6 | 7 | @click="gopath('/pages/orderList/aftersaledetails',item.afterId)" |
| ... | ... | @@ -82,11 +83,11 @@ |
| 82 | 83 | }, |
| 83 | 84 | onLoad(optiong) { |
| 84 | 85 | this.imgurl = this.$img |
| 85 | - this.getALL() | |
| 86 | - // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => { | |
| 87 | - // //成功回调 | |
| 88 | - // this.list = res.data.data.list | |
| 89 | - // }) | |
| 86 | + if(uni.getStorageSync('shopId')) { | |
| 87 | + this.getALL() | |
| 88 | + } else { | |
| 89 | + | |
| 90 | + } | |
| 90 | 91 | }, |
| 91 | 92 | onReachBottom(e) { |
| 92 | 93 | console.error(e) | ... | ... |
lvdao-miniapp/pages/orderList/inventory.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="page"> |
| 3 | + <view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view> | |
| 3 | 4 | <!-- <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> --> |
| 4 | 5 | <view style="padding: 0 20rpx;"> |
| 5 | 6 | <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/inventorydetails',item.orderId)" |
| ... | ... | @@ -74,11 +75,11 @@ |
| 74 | 75 | }, |
| 75 | 76 | onLoad(optiong) { |
| 76 | 77 | this.imgurl = this.$img |
| 77 | - this.getALL() | |
| 78 | - // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => { | |
| 79 | - // //成功回调 | |
| 80 | - // this.list = res.data.data.list | |
| 81 | - // }) | |
| 78 | + if(uni.getStorageSync('shopId')) { | |
| 79 | + this.getALL() | |
| 80 | + } else { | |
| 81 | + | |
| 82 | + } | |
| 82 | 83 | }, |
| 83 | 84 | onReachBottom (e){ |
| 84 | 85 | console.error(e) | ... | ... |
lvdao-miniapp/pages/orderList/inventorydetails.vue
| ... | ... | @@ -127,9 +127,9 @@ |
| 127 | 127 | onLoad(options) { |
| 128 | 128 | this.imgurl = this.$img |
| 129 | 129 | console.log(options) |
| 130 | - this.$http.sendRequest('/order/getById', 'POST', { | |
| 130 | + this.$http.sendRequest('/product/getById', 'POST', { | |
| 131 | 131 | orderId: options.id |
| 132 | - }, 1).then(res => { | |
| 132 | + }, 2).then(res => { | |
| 133 | 133 | this.dataList = res.data.data |
| 134 | 134 | }) |
| 135 | 135 | return | ... | ... |
lvdao-miniapp/pages/orderList/orderList.vue
| 1 | 1 | <template> |
| 2 | 2 | <view class="page"> |
| 3 | 3 | <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> |
| 4 | + <view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view> | |
| 4 | 5 | <view style="padding: 0 20rpx;"> |
| 5 | 6 | <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/orderListdetails',item.orderId)" |
| 6 | 7 | style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;"> |
| ... | ... | @@ -95,11 +96,13 @@ |
| 95 | 96 | }, |
| 96 | 97 | onLoad(optiong) { |
| 97 | 98 | this.imgurl = this.$img |
| 98 | - this.getALL() | |
| 99 | - // this.$http.sendRequest('/check/getAll', 'POST',{ this.pageindex}, 2).then(res => { | |
| 100 | - // //成功回调 | |
| 101 | - // this.list = res.data.data.list | |
| 102 | - // }) | |
| 99 | + if(uni.getStorageSync('shopId')) { | |
| 100 | + this.getALL() | |
| 101 | + } else { | |
| 102 | + | |
| 103 | + } | |
| 104 | + | |
| 105 | + | |
| 103 | 106 | }, |
| 104 | 107 | onReachBottom (e){ |
| 105 | 108 | console.error(e) | ... | ... |
lvdao-miniapp/pages/workbench/workbench.vue
| ... | ... | @@ -70,7 +70,7 @@ |
| 70 | 70 | <view class="bidding-title-line"></view>{{item.title}} |
| 71 | 71 | </view> |
| 72 | 72 | <view class="wallet-info"> |
| 73 | - <view class="list" v-for="v in item.children" :key="v.name" @click="toPath(v.path)"> | |
| 73 | + <view class="list" v-for="v in item.children" :key="v.name" @click="toPath1(v.path)"> | |
| 74 | 74 | <view class="icon"> |
| 75 | 75 | <image :src="$imgUrl(`${v.img}`)"></image> |
| 76 | 76 | </view> |
| ... | ... | @@ -302,6 +302,21 @@ pageList6: [{ |
| 302 | 302 | this.scrollTop = e.scrollTop; |
| 303 | 303 | }, |
| 304 | 304 | methods: { |
| 305 | + async toPath1(path) { | |
| 306 | + // let c1 = uni.getStorageSync('user').phone | |
| 307 | + let c1 = '18188305496' | |
| 308 | + await this.$http.sendRequest('/check/getAll','POST',{"shopPhone":c1,"checkState":"1","page":1,"pageSize":1}, 1).then(res => { | |
| 309 | + if(res.data.data.list.length>0) { | |
| 310 | + uni.setStorageSync('shopId', res.data.data.list[0].shopId); | |
| 311 | + } else { | |
| 312 | + // uni.show | |
| 313 | + uni.setStorageSync('shopId', ''); | |
| 314 | + } | |
| 315 | + }) | |
| 316 | + uni.navigateTo({ | |
| 317 | + url: path, | |
| 318 | + }) | |
| 319 | + }, | |
| 305 | 320 | toPath(path) { |
| 306 | 321 | uni.navigateTo({ |
| 307 | 322 | url: path, | ... | ... |
lvdao-miniapp/utils/request.js
| ... | ... | @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { |
| 30 | 30 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; |
| 31 | 31 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; |
| 32 | 32 | // bases = 'http://128.10.249.22:9003:9007' + url; |
| 33 | - // bases = 'http://192.168.2.230:9007' + url; | |
| 33 | + // bases = 'http://128.10.249.46:9007' + url; | |
| 34 | 34 | bases = c1 + 'cdwlMall/meserver/api' + url; |
| 35 | 35 | |
| 36 | 36 | }else{ |
| ... | ... | @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { |
| 39 | 39 | // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; |
| 40 | 40 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; |
| 41 | 41 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; |
| 42 | - // bases = 'http://192.168.2.230:9004' + url; | |
| 42 | + // bases = 'http://128.10.249.46:9004' + url; | |
| 43 | 43 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; |
| 44 | 44 | bases = c1 + 'cdwlMall/business-server' + url; |
| 45 | 45 | ... | ... |