Skip to content

Y
yawei

yawei / yawei

通知 3
Star 1
Fork 1
Y
yawei

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 b9e1bf31 编写于 作者: Y yang-zongying@qq.com
浏览文件
操作

修复bug

上级 a2ea3e1e
展开全部 隐藏空白更改
内联 并排
Showing with 597 addition and 808 deletion
components/addDonegoodsCard.vue
浏览文件 @ b9e1bf31
......@@ -40,12 +40,12 @@
<u-number-box v-model="goodsInfo.sqsl" :min="0" :max="goodsInfo.goodsKC" inputWidth="140"
bgColor="#EEF6FF">
<view slot="minus" class="minus">
<u-icon name="minus" size="12"></u-icon>
<u-icon name="minus" size="20"></u-icon>
</view>
<!-- <view slot="input" style="width: 80px;text-align: center;background-color: rgba(36, 86, 205, 0.1); padding: 2px 0px; margin: 0px 2px; border-radius: 3px;"
class="input">{{goodsInfo.goodsCount}}</view> -->
<view slot="plus" class="plus">
<u-icon name="plus" color="#2452D1" size="12"></u-icon>
<u-icon name="plus" color="#2452D1" size="20"></u-icon>
</view>
</u-number-box>
</view>
......@@ -87,6 +87,10 @@
export default {
name: "goodsCard",
props: {
isFold: {
type: Boolean,
default: true,
},
isAdd: {
type: Boolean,
default: false,
......@@ -123,7 +127,6 @@
data() {
return {
imgbaseUrl: this.$globalv.imgBaseUrl,
isFold: true,
};
},
created() {
......@@ -148,8 +151,8 @@
white-space: nowrap;
}
.minus {
width: 22px;
height: 22px;
width: 24px;
height: 24px;
border-width: 1px;
border-color: #E6E6E6;
border-style: solid;
......@@ -167,8 +170,8 @@
}
.plus {
width: 22px;
height: 22px;
width: 24px;
height: 24px;
background-color: #d7e7ff;
border-radius: 50%;
/* #ifndef APP-NVUE */
......
components/applyCard.vue
浏览文件 @ b9e1bf31
<template>
<view class="">
<view class="pdb stit">申请单号：{{sqItem.Num}}</view>
<view class="fl-rsbc mgb">
<view class="stit">申请单号：{{sqItem.Num}}</view>
<statusItem :status="sqItem.Status"/>
</view>
<view class="fl-rsbc mgb">
<view class="fl">
<view class="mgr5">
......@@ -9,17 +12,18 @@
</view>
<view class="fl-cls">
<view class="fl mgb5">
<text class="">{{sqItem.sqUser}}</text>
<span class="gray-tag mgl10">{{sqItem.sqBumen}}</span>
</view>
<view class="fl desc">
<text class="mgr5">{{sqItem.sqUser}}</text>
<view class="fl desc">
<u--image :showLoading="true" :src="imgbaseUrl + 'time.png'" width="14px" height="14px" class="mgr5" @click="click"></u--image>
{{ sqItem.sqDate }}
{{ $u.timeFormat(sqItem.sqDate, 'yyyy-mm-dd') }}
</view>
</view>
<view class="fl">
<span class="gray-tag">{{sqItem.sqBumen}}</span>
</view>
</view>
</view>
<statusItem :status="sqItem.Status"/>
</view>
<view class="fl">
<text class="stit">采购类型：</text>
......
components/cardTit.vue
浏览文件 @ b9e1bf31
......@@ -12,9 +12,9 @@
<view class="fl-rsb">
<view class="fl-cs">
<text class="stit mgr5">{{userInfo.st_name}}</text>
<view class="gray-tag tc">{{userInfo.deptName}}</view>
<!-- <view class="gray-tag tc">{{userInfo.deptName}}</view> -->
</view>
<view class="stext fl"><u--image :showLoading="true" :src="imgbaseUrl + 'time.png'" width="14px" height="14px" class="mgr5"></u--image>{{$u.timeFormat(iDate, 'yyyy年mm月dd日')}}</view>
<view class="stext fl"><u--image :showLoading="true" :src="imgbaseUrl + 'time.png'" width="14px" height="14px" class="mgr5"></u--image>{{$u.timeFormat(iDate, 'yyyy-mm-dd')}}</view>
</view>
</view>
</view>
......
components/userList.vue
浏览文件 @ b9e1bf31
<template>
<view style="height:400px; overflow-y: auto;">
<view class="pdb">
<u-search :searchIconSize="44" :height="78" v-model="keyword" shape="round" bgColor="#FFF" borderColor="#eee" actionText="检索" :clearabled="true" :actionStyle="{ 'background':'rgb(36, 82, 209)','color':'#FFF',padding:'9px 9px', borderRadius:'8px' }" @custom="searchGoods"></u-search>
<u-search :searchIconSize="44" :height="78" v-model="keyword" shape="round" bgColor="#FFF" borderColor="#eee" :clearabled="true" :showAction="false" ></u-search>
</view>
<view>
<view class="pdtb10" v-for="(item, index) in list" :key="index">
<view class="fl-rsb pdtb10 bd1" @click="selected(item)">
<view class="" v-for="(item, index) in listData" :key="index">
<view class="fl-rsb pdtb bd1" @click="selected(item)">
<view>{{item.name}}</view>
</view>
</view>
......@@ -40,12 +40,24 @@
['列表B1','列表B2','列表B3'],
['列表C1','列表C2','列表C3']
],
keyword:""
keyword:"",
listData:[]
}
},
created() {
this.$nextTick(()=>{
this.listData = this.list
console.log('this.listData',this.listData)
})
},
watch:{
keyword(){
keyword: {
handler: function(newVal, oldVal) {
console.log('person changed:', newVal, oldVal);
console.log('this.listData:', this.listData);
this.listData = this.list.filter(item => item.name.includes(newVal))
},
deep: true
}
},
methods: {
......
components/xzCardListItem.vue
浏览文件 @ b9e1bf31
......@@ -11,13 +11,13 @@
</view>
<view :class="['fl-rsb','']">
<view class="desctit fl">{{sqItem.sqrmc}}
<span class="gray-tag mgl5">{{sqItem.sqbmmc !== null ? sqItem.sqbmmc : "未分配"}}</span>
<span class="gray-tag mgl5">{{sqItem.sqbmmc !== null || sqItem.sqbmmc !== "" ? sqItem.sqbmmc : "未分配"}}</span>
</view>
<!-- <view class="mgb10 desc"> -->
<!-- 申请部门:{{sqItem.department}} -->
<!-- </view> -->
<view class=" desc fl"><u--image :showLoading="true" :src="imgbaseUrl + 'time.png'" width="14px" height="14px" class="mgr5"></u--image>{{ $u.timeFormat(sqItem.sqDate, 'yyyy年mm月dd日') }}</view>
<view class=" desc fl"><u--image :showLoading="true" :src="imgbaseUrl + 'time.png'" width="14px" height="14px" class="mgr5"></u--image>{{ $u.timeFormat(sqItem.sqDate, 'yyyy-mm-dd') }}</view>
</view>
<view v-if="sqItem.bz != '' && sqItem.bz != null">
<view class="fl mgt10">
......
pages/workSpace/wupin/wupinCG.vue
浏览文件 @ b9e1bf31
......@@ -6,12 +6,19 @@
<view class="cardview bgwhite">
<CardTit title="采购物料信息" icon="wpcg.png" :userInfo="userInfo" :iDate="sqDate" />
<view class="pdlr pdb">
<view class="bd1 w100 pdtb10 mgb fl-rsbc bgwhite cu" @click="isShowlyType = true">
<view class="">
<u--input v-model="cgForm.cgtype" readonly placeholder="请选择申请采购类型"
border="none"></u--input>
<view class="fl-grid2">
<view class="bd1 pdtb10 mgb fl-rsbc bgwhite cu mgr" @click="isShowlyType = true">
<view class="">
<u--input v-model="cgForm.cgtype" readonly placeholder="请选择申请采购类型"
border="none"></u--input>
</view>
<view class="cu mgr5"><u-icon name="arrow-down"></u-icon></view>
</view>
<view class="mgb bd1">
<view class="pdtb10">
{{userInfo.deptName}}
</view>
</view>
<view class="cu mgr5"><u-icon name="arrow-down"></u-icon></view>
</view>
<view class="w100 fl-rsbc bgwhite cu">
<view class="w100 fl-rsbc bgwhite cu bdr">
......@@ -40,7 +47,7 @@
</view>
</view>
</view>
<view class="pdb">
<!-- <view class="pdb">
<view class="fl-rsbc">
<view class="stit">附件：</view>
<view class="fl cu" @click="upload"><u--image :showLoading="true"
......@@ -63,7 +70,7 @@
<view class="cu pdl"><u-icon name="download" size="45"></u-icon></view>
</view>
</view>
</view>
</view> -->
</view>
</u--form>
<view class="fix-area bgwhite">
......@@ -328,4 +335,11 @@
this.$refs.uForm.setRules(this.rules)
},
};
</script>
\ No newline at end of file
</script>
<style scoped>
.fl-grid2{
display: grid;
grid-template-columns: 50% 50%;
grid-template-rows: 1fr;
}
</style>
\ No newline at end of file
pages/workSpace/wupin/wupinCGDetail.vue
浏览文件 @ b9e1bf31
<template>
<view class="detailPage bggray cardpd">
<view class="detailPage bggray cardpd h100">
<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
<u--form
labelPosition="top"
......@@ -15,7 +15,7 @@
<view class="stit">物品清单</view>
</view>
<view class="cardview bgwhite pd mgb10" v-for="(item,index) in goodsInfoList" :key="index">
<addDonegoodsCard :goodsInfo="item" :isDetail="true" :isCG="true" :isAdd="false"/>
<addDonegoodsCard :goodsInfo="item" :isDetail="true" :isFold="false" :isCG="true" :isAdd="false"/>
<!-- <view class="fl mgt">
<view class="mgr5"><u--image :src="imgbaseUrl + 'sl.png'" width="15px" height="15px" @click="click"></u--image></view>
<view class="stext">期望交付日期：2024-03-11 10:28</view>
......
pages/workSpace/wupin/wupinCGList.vue
浏览文件 @ b9e1bf31
......@@ -54,6 +54,9 @@
this.initData()
// })
},
onReady() {
this.initData()
},
onShow() {
// this.$nextTick(()=>{
this.initData()
......
pages/workSpace/wupin/wupinSL.vue
浏览文件 @ b9e1bf31
......@@ -7,12 +7,19 @@
<view class="mgb10 cardview bgwhite">
<CardTit title="申领物料信息" icon="wpsl.png" :userInfo="userInfo" :iDate="new Date().getTime()" />
<view class="pdlr pdb">
<view class="bd1 w100 pdtb10 mgb fl-rsbc bgwhite cu" @click="isShowlyType = true">
<view class="">
<u--input v-model="slForm.cgtype" readonly placeholder="请选择申请领用类型"
border="none"></u--input>
<view class="fl-grid2">
<view class="bd1 pdtb10 mgb fl-rsbc bgwhite cu mgr" @click="isShowlyType = true">
<view class="">
<u--input v-model="slForm.cgtype" readonly placeholder="请选择申请采购类型"
border="none"></u--input>
</view>
<view class="cu mgr5"><u-icon name="arrow-down"></u-icon></view>
</view>
<view class="mgb bd1">
<view class="pdtb10">
{{userInfo.deptName}}
</view>
</view>
<view class="cu mgr5"><u-icon name="arrow-down"></u-icon></view>
</view>
<view class="fl-rsbc">
<view class="ztext">是否扣除业务费</view>
......@@ -60,17 +67,17 @@
</view>
</view>
</view>
<view class="pdb">
<!-- <view class="pdb">
<view class="fl-rsbc">
<view class="stit">附件：</view>
<view class="fl cu" @click="upload"><u--image :showLoading="true" :src="imgbaseUrl + 'upload.png'"
width="20px" height="20px"></u--image>上传</view>
</view>
</view>
<view class="cardview pdtb mgb pdlr bgwhite">
</view> -->
<!-- <view class="cardview pdtb mgb pdlr bgwhite">
<uni-file-picker mode="grid" limit="5" file-mediatype="all" title="最多选择5个文件" ref="files"
:auto-upload="false" ></uni-file-picker>
</view>
</view> -->
<view class="fix-area bgwhite">
<view class="pdlr pdt">
<u-button type="primary" class="confirm-btn" @click="onGoodsCG">提交</u-button>
......@@ -174,7 +181,13 @@
}
});
// 获取采购列表
this.cgTypeList = await this.getWupinTypeList("dict_fscwlcgsqlx")
await this.getWupinTypeList("dict_fscwlcgsqlx").then(res=>{
this.cgTypeList = res
})
await this.getWupinTypeList("dict_jbr").then(res=>{
console.log(res)
this.xsyList = res
})
// uni.getStorage({
// key: 'wupinTypeList',
// success: function(res) {
......@@ -282,7 +295,6 @@
}
},
async open() {
this.xsyList = await this.getWupinTypeList("dict_jbr")
},
changeExpense(e) {},
cgTypeSelect(e) {
......@@ -326,4 +338,11 @@
// this.$refs.uForm.setRules(this.rules)
},
};
</script>
\ No newline at end of file
</script>
<style scoped>
.fl-grid2{
display: grid;
grid-template-columns: 50% 50%;
grid-template-rows: 1fr;
}
</style>
\ No newline at end of file
pages/workSpace/wupin/wupinSLDetail.vue
浏览文件 @ b9e1bf31
<template>
<view class="detailPage bggray cardpd">
<view class="detailPage bggray cardpd h100">
<u--form
labelPosition="top"
labelWidth="400"
......@@ -13,7 +13,7 @@
<view class="stit">物品清单</view>
</view>
<view class="cardview bgwhite pd mgb10" v-for="(item,index) in goodsInfoList" :key="index">
<addDonegoodsCard :goodsInfo="item" :isDetail="true" :isCG="true" :isAdd="false"/>
<addDonegoodsCard :goodsInfo="item" :isDetail="true" :isFold="false" :isCG="true" :isAdd="false"/>
</view>
</view>
<!-- <view class="pdb">
......@@ -82,18 +82,24 @@ export default {
initData(){
console.log("initData")
const eventChannel = this.getOpenerEventChannel();
let headImgSrc
eventChannel.once('slDetail', ({data}) => {
console.log(data)
uni.$u.http.post('/xzgl/wllyList', {"st_id":data.stid,"zyid":data.zyid} ).then(res => {
uni.$u.http.post('/xzgl/wllyList', {"st_id":data.stid,"zyid":data.zyid} ).then( async res => {
console.log('wllyList:',res);
await uni.$u.http.post('/GetStaffImg', {"st_id": res[0].sqr } ).then((res2) => {
console.log('data', res2);
headImgSrc = "data:image/png;base64," + res2[0]["imgStr"]
})
// 数据处理
this.sqItem = {
Num: data.Num,
headImgSrc: headImgSrc,
Status: res[0].flowStatus,
StatusName: data.StatusName,
sqBumen: res[0].sqbmmc,
sqDate: data.sqDate,
sqcglxmc: res[0].sqlylx,
sqcglxmc: res[0].sqlylxmc,
sqUser: res[0].sqrmc,
zyid: res[0].zyid,
isDeduct: Boolean(res[0].flag_kywf),
......
pages/workSpace/wupin/wupinSLList.vue
浏览文件 @ b9e1bf31
......@@ -35,10 +35,13 @@
this.initData()
})
},
onReady() {
this.initData()
},
onShow() {
this.$nextTick(()=>{
// this.$nextTick(()=>{
this.initData()
})
// })
},
methods: {
initData() {
......
unpackage/dist/dev/app-plus/app-service.js
浏览文件 @ b9e1bf31
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或