diff --git a/compontent/public/exit.vue b/compontent/public/exit.vue
index 16bb0e8..15b2c90 100644
--- a/compontent/public/exit.vue
+++ b/compontent/public/exit.vue
@@ -14,7 +14,7 @@
确定
- 确定要退出登录吗
+ {{cont}}
@@ -26,16 +26,20 @@
type: Boolean,
default: true
},
+ cont:{
+ type: String,
+ default: ''
+ }
});
- const emit = defineEmits(["close"]);
+ const emit = defineEmits(["close",'go']);
// 关闭方法，通知父组件更新 show
function handleClose() {
emit('close');
}
const go = () => {
- uni.exitMiniProgram({});
+ emit('go');
}
diff --git a/pages/addjigou/where.vue b/pages/addjigou/where.vue
index e1c351a..9f147c7 100644
--- a/pages/addjigou/where.vue
+++ b/pages/addjigou/where.vue
@@ -69,7 +69,7 @@
-
+
@@ -103,14 +103,14 @@
-
+
- 建筑面积m²
+ 建筑面积(m²)
@@ -127,6 +127,7 @@
提交
+
@@ -140,7 +141,7 @@
onLoad,
onShow
} from '@dcloudio/uni-app';
-
+ import exit from "@/compontent/public/exit.vue"
import {
base_url
} from '@/request/index.js'
@@ -156,7 +157,7 @@
import {
shallowEqualObjects
} from '@/compontent/public/issame.js'
-
+ const exitshow = ref(false);
const address = ref([])
const show = ref(false);
const content = ref("");
@@ -331,12 +332,11 @@
uni.setStorageSync("backhuancun", data)
changemessage(uni.getStorageSync('backhuancun'), ukey.value).then(res => {
if (res.success ) {
-
uni.requestSubscribeMessage({
// 这里填后台申请好的 templateId 数组
tmplIds: ['cWVzXm1C-iitx1gNFn1nZdijq9R_3fCv8vLbiqs9zww'],
success: (res) => {
- uni.setStorageSync('specicalid', "");
+ uni.setStorageSync('specicalid', data.optType == "bg"?true:false);
uni.reLaunch({
url: `/pages/login/specialsmall?type=1&special=${uni.getStorageSync('backhuancun').id===null}`
});
@@ -352,23 +352,8 @@
} else {
if(res.message=="未做变更"){
- uni.showModal({
- title: '提示',
- content: '当前无变更，是否提交？',
- confirmColor:'#007CFF',
- success: function (res) {
- if (res.confirm) {
- flag.value = true;
- izSkipRepetVali.value = "Y";
- ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}`
- next()
- } else if (res.cancel) {
- flag.value = true;
- ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}`
- console.log('用户点击取消');
- }
- }
- });
+ exitshow.value = true
+
}else{
uni.showToast({
title:res.message,
@@ -385,6 +370,20 @@
})
}
}
+ const go = (e)=>{
+ if (e==1) {
+ flag.value = true;
+ exitshow.value = false;
+ izSkipRepetVali.value = "Y";
+ ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}`
+ next()
+ } else {
+ exitshow.value = false;
+ flag.value = true;
+ ukey.value = `${uni.getStorageSync('openid') || ''}jgbg${String(Date.now()).slice(-5)}${String(Math.floor(Math.random() * 1900) + 100)}`
+ console.log('用户点击取消');
+ }
+ }
const flag = ref(false)
const izSkipRepetVali = ref('N')
const goBack = () => {
@@ -475,19 +474,19 @@
});
}
- function formatArea() {
+ function formatArea(e) {
+ console.log(e.detail.value)
const value = form.orgBuildingArea;
const firstDot = value.indexOf('.');
const lastDot = value.lastIndexOf('.');
-
let cleaned = value;
// 如果出现多个小数点，则去掉最后一个后面的
if (firstDot !== lastDot) {
cleaned = value.slice(0, lastDot);
}
- if(cleaned>9999.99){
- form.orgBuildingArea = 9999.99
+ if(Number(cleaned)>=10000){
+ form.orgBuildingArea = e.detail.value.slice(0, 4);
}
// 限制小数点后只能有最多 4 位
@@ -495,7 +494,7 @@
const [intPart, decimalPart] = cleaned.split('.');
cleaned = intPart + '.' + decimalPart.slice(0, 4);
}
-
+ console.log(form.orgBuildingArea)
// 如果格式有变动，则更新
if (cleaned !== value) {
nextTick(() => {
diff --git a/pages/addoldman/oldIDcard.vue b/pages/addoldman/oldIDcard.vue
index 02bc607..05b7253 100644
--- a/pages/addoldman/oldIDcard.vue
+++ b/pages/addoldman/oldIDcard.vue
@@ -38,7 +38,7 @@
监护人姓名
-
+
监护人电话
@@ -49,7 +49,7 @@
身份证号
-
+
家庭住址
@@ -120,7 +120,7 @@
医保类型
-
+
失能等级
-
+
-
+
身高 (CM)
-
@@ -62,7 +62,7 @@
@confirm="confirmshowshengao">
体重 (KG)
-
@@ -75,7 +75,7 @@
-
+
-
+
-
+
现住址
diff --git a/pages/addsupplier/all.vue b/pages/addsupplier/all.vue
index d9cc03f..e2a3f69 100644
--- a/pages/addsupplier/all.vue
+++ b/pages/addsupplier/all.vue
@@ -18,10 +18,10 @@
padding:20rpx;
background: RGBA(255, 240, 240, 1);
border: 1px solid RGBA(247, 175, 174, 1);"
- v-if="datas.suppliersStatus==3||datas.suppliersStatus==5">
+ v-if="datas.applyStatus==3||datas.applyStatus==5">
i
- 驳回原因：{{datas.auditContent}}
+ 驳回原因：{{datas.applyContent}}
审核驳回
@@ -35,13 +35,13 @@
编辑
+ :src="datas.applyStatus? `https://www.focusnu.com/media/directive/index/${statusarray[datas.applyStatus-1]}.png`:``" />
@@ -78,7 +78,7 @@
-
@@ -18,10 +18,10 @@
-->
-
+
+ v-if="item.applyStatus =='1'">
@@ -49,7 +49,7 @@
-->
-
+
@@ -59,7 +59,7 @@
- 您提交的"{{item.departName}}"
+ 您提交的"{{item.suppliersName}}"
供应商入驻申请
正在审核中
@@ -74,7 +74,7 @@
-
+
@@ -84,7 +84,7 @@
- 您提交的"{{item.departName}}"
+ 您提交的"{{item.suppliersName}}"
供应商入驻申请
审核驳回
@@ -94,7 +94,7 @@
-
+
驳回原因
@@ -103,7 +103,7 @@
-
+
-
+
供应商信息
-
+
@@ -169,7 +169,7 @@
+ v-if="item.applyStatus==`-1`">
@@ -247,7 +247,7 @@
} from '@dcloudio/uni-app';
import {
- getSuppliersOrgInfo,
+ getSuppliersApplyInfo,
isRead,
invitedConfirm,
applySupOrg,
@@ -270,7 +270,7 @@
})
}
- const buttonArray = ref(["供应商", "物料信息", "敬请期待"])
+ const buttonArray = ref(["物料信息", "敬请期待", "敬请期待"])
const statusarray = ["loading", "success", "fail"]
const which = ref(0);
@@ -298,7 +298,7 @@
// }
// });
uni.navigateTo({
- url: "/pages/supplierindex/searchjigou"
+ url: "/pages/addsupplier/information"
})
}
const clearvalue = () => {
@@ -323,19 +323,34 @@
});
}
const jumpToAll = (element) => {
- getSupInfoByOpenId(element.orgCode).then(res => {
+ getSupInfoByOpenId(element.suppliersId).then(res => {
if (res.success) {
+ if(res.result.applyStatus==4){
+ uni.showToast({
+ icon:'none',
+ title:"信息变更中"
+ })
+ return
+ }
uni.navigateTo({
- url: `/pages/addsupplier/all?element=${JSON.stringify(res.result)}&code=1`
+ url: `/pages/addsupplier/information?element=${JSON.stringify(res.result)}&code=1`
});
+ // uni.navigateTo({
+ // url: `/pages/addsupplier/all?element=${JSON.stringify(res.result)}&code=1`
+ // });
}
})
}
const look = (element) => {
- uni.navigateTo({
- url: `/pages/supplierindex/workjoin`
- });
+ getSupInfoByOpenId(element.suppliersId).then(res => {
+ if (res.success) {
+ uni.navigateTo({
+ url: `/pages/addsupplier/all?element=${JSON.stringify(res.result)}&code=0`
+ });
+ }
+
+ })
}
const again = (item) => {
jumpToAll(item)
@@ -432,15 +447,17 @@
const menuArray = ref([])
const item = ref([])
const loadingData = () => {
- getSuppliersOrgInfo().then(res => {
- item.value = res.result.records[0]
+ getSuppliersApplyInfo().then(res => {
+ if(!res.result){
+ item.value.applyStatus= `-1`
+ }else{
+ item.value = res.result
+ }
// menuArray.value = []
// res.result.records.forEach((element) => {
// menuArray.value.push(element)
// })
- // menuArray.value.push({
- // applyStatus: `-1`
- // })
+
})
// getMessageList().then(res => {
// console.log("special", res)
@@ -470,15 +487,13 @@
}
const clickButton = (item, index) => {
if (index === 0) {
- getSupInfoByOpenId(item.orgCode).then(res => {
- // console.log("look",res)
- // uni.setStorageSync("changeyuangongorgCode", item.orgCode)
- if (res.success) {
- uni.navigateTo({
- url: `/pages/addsupplier/all?element=${JSON.stringify(res.result)}&code=1`
- });
- }
- })
+ // getSupInfoByOpenId(item.orgCode).then(res => {
+ // if (res.success) {
+ // uni.navigateTo({
+ // url: `/pages/addsupplier/all?element=${JSON.stringify(res.result)}&code=1`
+ // });
+ // }
+ // })
}
}
const jumptolist = (res) => {
diff --git a/pages/yuangongindex/index.vue b/pages/yuangongindex/index.vue
index d4fda42..2168db3 100644
--- a/pages/yuangongindex/index.vue
+++ b/pages/yuangongindex/index.vue
@@ -239,7 +239,8 @@
-
+
{{menuArray[which]?.departName}}
@@ -537,6 +538,12 @@
show.value = true
}
}
+ const jumpt = (res) => {
+ if (res.length>20) {
+ content.value = res;
+ show.value = true
+ }
+ }
onShow(() => {
loadingData();
isRead().then(res => {
@@ -564,6 +571,17 @@