Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini
This commit is contained in:
commit
48009c8bf2
|
|
@ -155,7 +155,7 @@ export const queryCountByType = (data) => {
|
|||
// 即时指令内容
|
||||
export const queryAll = (data) => {
|
||||
return request({
|
||||
url: `${uni.getStorageSync('serverUrl')}/services/directivePlanInstant/queryAll?nuId=${data.nuId}&elderId=${data.elderId}`,
|
||||
url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getImmediatelyOrderByNuID?nuId=${data.nuId}&elderId=${data.elderId}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
|
@ -118,9 +118,10 @@
|
|||
</view>
|
||||
<scroll-view class="scrol" scroll-y="true">
|
||||
<view v-for="(v,i) in fwzlarr" :key='i' :class="i==fwzldex?'act':''" class="cdk" @click="zldex(i)">
|
||||
<image :src="fwzldex!=i?v.netImmediateFile:v.netPreviewFileSmall" mode="aspectFill"></image>
|
||||
<image :src="serverUrl+(fwzldex!=i?v.previewFile:v.previewFileSmall)" mode="aspectFill"></image>
|
||||
<text style="white-space: nowrap;width: 100%;text-overflow: ellipsis;overflow: hidden;">{{v.directiveName?.substring(0,4)}}</text>
|
||||
<view>{{v.directiveName?.substring(4,12)}}</view>
|
||||
|
||||
</view>
|
||||
<view style="width: 13vw;height: 13vw;margin: 7vw 0 0 23.5vw;display: block;background: none;" v-if="fwzlarr?.length==0||!fwzlarr">
|
||||
<image src="/static/index/card/zw.png" mode="aspectFill" style="width:13vw;height: 13vw"></image>
|
||||
|
|
@ -131,7 +132,7 @@
|
|||
</scroll-view>
|
||||
<view class="submit" >
|
||||
<view @click.stop="jszlshow = false">取消</view>
|
||||
<view @click="subitshowing" v-if="fwzldex>0">确定</view>
|
||||
<view @click="subitshowing" v-if="fwzldex>-1">确定</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -303,22 +304,6 @@
|
|||
})
|
||||
const zdxzdex = ref(0)
|
||||
const zdxzarr = ref(0)
|
||||
const zhixing = (e)=>{
|
||||
if(indexmessage.value?.izStart=='Y' && e ==1){
|
||||
uni.showToast({
|
||||
title:'服务中不能转单！',
|
||||
icon:'none'
|
||||
})
|
||||
return
|
||||
}
|
||||
queryEmpList({id:uni.getStorageSync('userInfo').id}).then(res=>{
|
||||
zdxzarr.value = res.result;
|
||||
zdxzarr.value.forEach(item=>{
|
||||
item.flag = false
|
||||
})
|
||||
zdxzdex.value = e;
|
||||
})
|
||||
}
|
||||
const flag = ref(false)
|
||||
const zdwu = (e,k)=>{
|
||||
if(zdxzdex.value==1){
|
||||
|
|
@ -345,241 +330,15 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
const zhixingsub = ()=>{
|
||||
zxzd.value = zdxzdex.value
|
||||
if(zdxzdex.value==1){
|
||||
zdcont.value = "确认转单执行？"
|
||||
}
|
||||
if(zdxzdex.value==2){
|
||||
zdcont.value = "确认协助执行？"
|
||||
}
|
||||
}
|
||||
const zxzd = ref(0);
|
||||
const zdcont = ref('');
|
||||
const tijiaozx = ()=>{
|
||||
if(zxzd.value == 1){
|
||||
let s = {}
|
||||
zdxzarr.value.forEach((item,i)=>{
|
||||
if(item.flag){
|
||||
s = item;
|
||||
}
|
||||
})
|
||||
let obj = {
|
||||
mainId:indexmessage.value.mainId,
|
||||
employeeId:s.id,
|
||||
employeeName:s.name,
|
||||
beforeBy:indexmessage.value.employeeId,
|
||||
beforeByName:indexmessage.value.employeeName
|
||||
}
|
||||
let nuId = uni.getStorageSync('nuId');
|
||||
transferOrder(obj).then(res=>{
|
||||
if(res.success){
|
||||
firstgetqueryCgdList(nuId);
|
||||
flag.value = false;
|
||||
zxzd.value = 0;
|
||||
zdxzdex.value = 0;
|
||||
}
|
||||
})
|
||||
}
|
||||
if(zxzd.value == 2){
|
||||
let userinfo = uni.getStorageSync('userInfo')
|
||||
let id = userinfo.id+',';
|
||||
let name = userinfo.realname+',';
|
||||
zdxzarr.value.forEach((item,i)=>{
|
||||
if(item.flag){
|
||||
id+=item.id+','
|
||||
name+=item.name+','
|
||||
}
|
||||
})
|
||||
id = id.slice(0, -1);
|
||||
name = name.slice(0, -1);
|
||||
let obj = {
|
||||
mainId:indexmessage.value.mainId,
|
||||
optIds:id,
|
||||
optNames:name,
|
||||
beforeBy:indexmessage.value.employeeId,
|
||||
beforeByName:indexmessage.value.employeeName
|
||||
}
|
||||
assistOrder(obj).then(res=>{
|
||||
if(res.success){
|
||||
firstgetqueryCgdList(form.nuId)
|
||||
// clickLeftMenu(0,{id:indexmessage.value.mainId})
|
||||
flag.value = false;
|
||||
zxzd.value = 0;
|
||||
zdxzdex.value = 0;
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
const plsbuy = ref([])
|
||||
const firstgetqueryCgdList = (nuId) => {
|
||||
form.nuId = nuId;
|
||||
queryOrderList(form).then(res => {
|
||||
console.log(form)
|
||||
if(res.result.records.length>0){
|
||||
indexmessage.value = res.result.records[0]
|
||||
// clickLeftMenu(0,res.result.records[0])
|
||||
}else{
|
||||
indexmessage.value = {};
|
||||
}
|
||||
})
|
||||
}
|
||||
const clickLeftMenu = (index : any, item : object) => {
|
||||
queryOrderInfoList({ mainId: item.id }).then(res => {
|
||||
if(res.result.length>0){
|
||||
indexmessage.value = res.result[0]
|
||||
}else{
|
||||
indexmessage.value = {};
|
||||
}
|
||||
})
|
||||
}
|
||||
const open = ref(0)
|
||||
const donghuaopo = ref(false);
|
||||
const topbuttontarget = ref(0);
|
||||
const ilanarr = ref([]);
|
||||
const listobj = ref({});
|
||||
const ysptp = (v,i,r) =>{
|
||||
// v.manuallyPicPath
|
||||
if(r == 1&&v.manuallyPicPath){
|
||||
ilanarr.value = v.manuallyPicPath.split(",");
|
||||
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
||||
}else if(r == 2&&v.manuallyMp4Path){
|
||||
|
||||
ilanarr.value = v.manuallyMp4Path.split(",");
|
||||
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
||||
}else if(r == 3&&v.tplinkPath){
|
||||
ilanarr.value = v.tplinkPath.split(",");
|
||||
ilanarr.value = ilanarr.value.filter(item => item !== '');
|
||||
}
|
||||
else{
|
||||
ilanarr.value = [];
|
||||
}
|
||||
|
||||
listobj.value = v;
|
||||
topbuttontarget.value = r;
|
||||
donghuaopo.value = true;
|
||||
}
|
||||
const uplod = (v) => {
|
||||
if(topbuttontarget.value==1){
|
||||
uni.chooseImage({
|
||||
count: 1, //默认9
|
||||
sizeType: ['compressed'], //可以指定是原图还是压缩图，默认二者都有
|
||||
sourceType: ['camera'], //从相册选择
|
||||
success: (e) => {
|
||||
let ar = JSON.stringify(e.tempFilePaths)
|
||||
uni.compressImage({
|
||||
src: JSON.parse(ar)[0],
|
||||
quality: 60,
|
||||
success: res => {
|
||||
sxdupld(res.tempFilePath)
|
||||
// v.picPatharr.push(res.tempFilePath);
|
||||
}
|
||||
})
|
||||
}
|
||||
});
|
||||
}else{
|
||||
uni.chooseVideo({
|
||||
sourceType: ['camera' ],
|
||||
success: (e)=> {
|
||||
uni.showLoading({
|
||||
title:'正在上传...'
|
||||
})
|
||||
uni.compressVideo({
|
||||
src: e.tempFilePath,
|
||||
quality: 'medium',
|
||||
success: res => {
|
||||
sxdupld(res.tempFilePath)
|
||||
// v.picPatharr.push(res.tempFilePath);
|
||||
}
|
||||
})
|
||||
// sxdupld(res.tempFilePath )
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
const sxdupld = (e) => {
|
||||
let now = new Date();
|
||||
let year = now.getFullYear();
|
||||
let month = now.getMonth() + 1;
|
||||
uni.uploadFile({
|
||||
url: uni.getStorageSync('serverUrl') + '/sys/common/upload',
|
||||
filePath: e,
|
||||
name: 'file',
|
||||
fileType:topbuttontarget.value==2?'video':'image',
|
||||
formData: {
|
||||
biz: year + '/' + month + (topbuttontarget.value==1?'/fwxm/manuallyPicPath':'/fwxm/manuallyMp4Path')
|
||||
},
|
||||
header: {
|
||||
'X-Access-Token': uni.getStorageSync('token')
|
||||
},
|
||||
success: res => {
|
||||
const data = JSON.parse(res.data);
|
||||
ilanarr.value.push(data.message)
|
||||
uni.hideLoading()
|
||||
},
|
||||
fail: () => {
|
||||
uni.hideLoading()
|
||||
uni.showToast({ title: '上传失败', icon: 'none' })
|
||||
}
|
||||
})
|
||||
}
|
||||
const submit = ()=>{
|
||||
let sub = "";
|
||||
ilanarr.value.forEach(item=>{
|
||||
sub+=item+','
|
||||
})
|
||||
if(topbuttontarget.value == 1){
|
||||
editSubPicPath({id:listobj.value.id,manuallyPicPath:sub}).then(res=>{
|
||||
if(res.success){
|
||||
topbuttontarget.value = 0;
|
||||
donghuaopo.value = false;
|
||||
firstgetqueryCgdList(form.nuId)
|
||||
// clickLeftMenu(0,{id:indexmessage.value.mainId})
|
||||
}
|
||||
})
|
||||
}else{
|
||||
editSubMp4({id:listobj.value.id,manuallyMp4Path:sub}).then(res=>{
|
||||
console.log({id:listobj.value.id,manuallyMp4Path:sub},res)
|
||||
if(res.success){
|
||||
topbuttontarget.value = 0;
|
||||
donghuaopo.value = false;
|
||||
firstgetqueryCgdList(form.nuId)
|
||||
// clickLeftMenu(0,{id:indexmessage.value.mainId})
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
const previewImage = (v, i, arr) => {
|
||||
if(topbuttontarget.value == 1){
|
||||
let u = []
|
||||
arr.forEach(e => {
|
||||
u.push(serverpicUrl.value + e)
|
||||
})
|
||||
uni.previewImage({
|
||||
current: i,
|
||||
urls: u,
|
||||
showmenu: false,
|
||||
longPressActions: {
|
||||
itemList: [],
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
const videoContext = ref(null)
|
||||
const play = (e,i)=>{
|
||||
videoContext.value = uni.createVideoContext('myVideo'+i);
|
||||
videoContext.value.play()
|
||||
}
|
||||
const pici = ref(0);
|
||||
const del = (v,i) =>{
|
||||
pici.value = i;
|
||||
}
|
||||
const del1=()=>{
|
||||
ilanarr.value.splice(pici.value,1);
|
||||
open.value = 0
|
||||
}
|
||||
//
|
||||
|
||||
const openerror = ref(false);
|
||||
const errmsg = ref('')
|
||||
const props = defineProps({
|
||||
|
|
@ -589,46 +348,6 @@
|
|||
},
|
||||
|
||||
});
|
||||
const errmsgclk = (e,k)=>{
|
||||
if(k==1){
|
||||
if(indexmessage.value?.izStart=='Y'){
|
||||
switch (e){
|
||||
case 0:
|
||||
if(indexmessage.value?.serviceContent==''){return}
|
||||
errmsg.value = indexmessage.value?.serviceContent
|
||||
break;
|
||||
case 1:
|
||||
if(indexmessage.value?.mp3File==''){return}
|
||||
errmsg.value = indexmessage.value?.mp3File
|
||||
break;
|
||||
case 2:
|
||||
if(indexmessage.value?.mp4File==''){return}
|
||||
errmsg.value = indexmessage.value?.mp4File
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
openerror.value = true;
|
||||
}
|
||||
}else{
|
||||
if(indexmessage.value?.izStart=='Y'){
|
||||
|
||||
switch (e){
|
||||
case 3:
|
||||
ysptp(indexmessage.value,0,1)
|
||||
break;
|
||||
case 4:
|
||||
ysptp(indexmessage.value,0,2)
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
const leftMenuArray = ref([]);
|
||||
const menutarget = ref(0)
|
||||
const emit = defineEmits(['swip',"gospecial"])
|
||||
|
|
@ -664,22 +383,24 @@
|
|||
nuId:nuId,
|
||||
elderId:elderId
|
||||
}
|
||||
// queryAll(data).then(res=>{
|
||||
// zlarr.value = res.result;
|
||||
// shtab(fwzlindex.value)
|
||||
// })
|
||||
queryAll(data).then(res=>{
|
||||
zlarr.value = res.result;
|
||||
shtab(fwzlindex.value)
|
||||
})
|
||||
}
|
||||
const shtab = (e)=>{
|
||||
fwzlindex.value = e;
|
||||
if(e==0){
|
||||
fwzlarr.value = zlarr.value?.care
|
||||
fwzlarr.value = zlarr.value?.hlList
|
||||
}
|
||||
if(e==1){
|
||||
fwzlarr.value = [];
|
||||
fwzlarr.value = zlarr.value?.ylList;
|
||||
}
|
||||
if(e==2){
|
||||
fwzlarr.value = zlarr.value?.logistics
|
||||
fwzlarr.value = zlarr.value?.hqList
|
||||
}
|
||||
fwzldex.value = -1
|
||||
console.log(zlarr.value,serverUrl.value)
|
||||
}
|
||||
const zldex = (e) =>{
|
||||
if(e>-1&&e==fwzldex.value){
|
||||
|
|
@ -724,37 +445,6 @@
|
|||
// e.detail.scrollTop 就是当前滚动距离
|
||||
scrollTop.value = e.detail.scrollTop
|
||||
}
|
||||
const severcards = ref<InstanceType<typeof ChildComponent>>()
|
||||
const start = (v) =>{
|
||||
if(v.izStart!='N'){return}
|
||||
startOrder({id:v.id}).then(res=>{
|
||||
if(res.success){
|
||||
v.izStart = "Y";
|
||||
severcards.value.firstgetqueryCgdList()
|
||||
}else{
|
||||
|
||||
|
||||
}
|
||||
})
|
||||
}
|
||||
const end = (v)=>{
|
||||
if(indexmessage.value.izStart=='Y'&& indexmessage.value.izFinish=='N'){
|
||||
open.value=3;
|
||||
}
|
||||
}
|
||||
const ends = ()=>{
|
||||
|
||||
endOrder({id:indexmessage.value.id}).then(res=>{
|
||||
if(res.success){
|
||||
open.value=0;
|
||||
severcards.value.firstgetqueryCgdList()
|
||||
firstgetqueryCgdList(uni.getStorageSync('nuId'))
|
||||
}else{
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
}
|
||||
// 通用的生成函数
|
||||
function genPaths(base, prefix, count, ext = 'png', startIndex = 0, pad = false) {
|
||||
return Array.from({ length: count }, (_, i) => {
|
||||
|
|
@ -1006,7 +696,6 @@
|
|||
case 3:
|
||||
return 13.4;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1537,10 +1226,11 @@
|
|||
display: inline-block;
|
||||
border: 1px solid #F8F8F8;
|
||||
text-align: center;
|
||||
overflow: hidden;
|
||||
image{
|
||||
width: 2vw;
|
||||
height: 2vw;
|
||||
margin: 1.4vw auto 0vw;
|
||||
margin: 1vw auto 0vw;
|
||||
}
|
||||
text{
|
||||
display: block;
|
||||
|
|
|
|||
|
|
@ -28,13 +28,10 @@
|
|||
|
||||
<view class="title-card-right" @click="jszlshow = true">
|
||||
<view class="card-top">
|
||||
<view class="card-top-left">
|
||||
|
||||
</view>
|
||||
<view class="card-top-left"> </view>
|
||||
<view class="card-top-right">
|
||||
<image class="right-img" src="/static/index/card/arrow.png" />
|
||||
</view>
|
||||
|
||||
</view>
|
||||
<view class="card-bottom">
|
||||
<image class="bottom-img" src="/static/index/card/alarm.png" />
|
||||
|
|
@ -273,10 +270,10 @@
|
|||
nuId:nuId,
|
||||
// elderId:elderId
|
||||
}
|
||||
// queryAll(data).then(res=>{
|
||||
// console.log(res)
|
||||
// zlarr.value = res.result.invoicing;
|
||||
// })
|
||||
queryAll(data).then(res=>{
|
||||
console.log(res)
|
||||
zlarr.value = res.result.ckList;
|
||||
})
|
||||
}
|
||||
const zldex = (e) =>{
|
||||
if(e>-1&&e==fwzldex.value){
|
||||
|
|
@ -653,6 +650,7 @@
|
|||
margin-top: 25rpx;
|
||||
width: 105%;
|
||||
left: -1vw;
|
||||
z-index: 999;
|
||||
}
|
||||
|
||||
.date {
|
||||
|
|
@ -859,6 +857,7 @@
|
|||
width: 100%;
|
||||
height: 3vw;
|
||||
display: flex;
|
||||
z-index: 999;
|
||||
|
||||
.bottom-img {
|
||||
width: 1.8vw;
|
||||
|
|
|
|||
|
|
@ -570,7 +570,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
|
||||
const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
|
||||
export {
|
||||
camera as default
|
||||
};
|
||||
|
|
|
|||
|
|
@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|||
)
|
||||
]);
|
||||
}
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
|
||||
export {
|
||||
fullcamera as default
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue