Commit b4ff8d6a authored by 李苏's avatar 李苏 💬

新增两个审批功能,修改bug

parent 24bb602c
......@@ -51,13 +51,13 @@ const routes = [
title: '退出',
},
},
{
path: '/pages/user/location',
name: 'location',
meta: {
title: '定位',
},
},
// {
// path: '/pages/user/location',
// name: 'location',
// meta: {
// title: '定位',
// },
// },
{
path: '/pages/common/exit',
name: 'exit',
......@@ -113,90 +113,90 @@ const routes = [
title: '通知详情',
},
},
{
path: '/pages/common/helloWorld',
name: 'helloWorld',
meta: {
title: 'helloWorld',
},
},
{
path: '/pages/common/ygqj',
name: 'ygqj',
meta: {
title: 'ygqj',
},
},
{
path: '/pages/common/qjxq',
name: 'qjxq',
meta: {
title: '请假详情',
},
},
{
path: '/pages/common/fybx',
name: 'fybx',
meta: {
title: '费用报销',
},
},
{
path: '/pages/common/fybxxq',
name: 'fybxxq',
meta: {
title: '费用报销详情',
},
},
{
path: '/pages/process/process',
name: 'process',
meta: {
title: 'process',
},
},
{
path: '/pages/process/dbswgzrw',
name: 'dbswgzrw',
meta: {
title:'dbswgzrw',
},
},
{
path: '/pages/process/dbswfybx',
name: 'dbswfybx',
meta: {
title:'dbswfybx',
},
},
{
path: '/pages/process/toprocessing',
name: 'toprocessing',
meta: {
title: '处理',
},
},
{
path: '/pages/process/tockxx',
name: 'tockxx',
meta: {
title: '查看详情',
},
},
{
path: '/pages/process/wdswfybx',
name: 'wdswfybx',
meta: {
title: 'wdswfybx',
},
},
{
path: '/pages/process/qjdedit',
name: 'qjdedit',
meta: {
title: '编辑请假单',
},
},
// {
// path: '/pages/common/helloWorld',
// name: 'helloWorld',
// meta: {
// title: 'helloWorld',
// },
// },
// {
// path: '/pages/common/ygqj',
// name: 'ygqj',
// meta: {
// title: 'ygqj',
// },
// },
// {
// path: '/pages/common/qjxq',
// name: 'qjxq',
// meta: {
// title: '请假详情',
// },
// },
// {
// path: '/pages/common/fybx',
// name: 'fybx',
// meta: {
// title: '费用报销',
// },
// },
// {
// path: '/pages/common/fybxxq',
// name: 'fybxxq',
// meta: {
// title: '费用报销详情',
// },
// },
// {
// path: '/pages/process/process',
// name: 'process',
// meta: {
// title: 'process',
// },
// },
// {
// path: '/pages/process/dbswgzrw',
// name: 'dbswgzrw',
// meta: {
// title:'dbswgzrw',
// },
// },
// {
// path: '/pages/process/dbswfybx',
// name: 'dbswfybx',
// meta: {
// title:'dbswfybx',
// },
// },
// {
// path: '/pages/process/toprocessing',
// name: 'toprocessing',
// meta: {
// title: '处理',
// },
// },
// {
// path: '/pages/process/tockxx',
// name: 'tockxx',
// meta: {
// title: '查看详情',
// },
// },
// {
// path: '/pages/process/wdswfybx',
// name: 'wdswfybx',
// meta: {
// title: 'wdswfybx',
// },
// },
// {
// path: '/pages/process/qjdedit',
// name: 'qjdedit',
// meta: {
// title: '编辑请假单',
// },
// },
{
path: '/pages/process/fybxdedit',
name: 'fybxdedit',
......@@ -266,6 +266,20 @@ const routes = [
meta: {
title: '领料单审批',
},
},
{
path: '/pages/cgddsp/cgddsp',
name: 'cgddsp',
meta: {
title: '采购订单审批',
},
},
{
path: '/pages/xsddsp/allcklc',
name: 'allcklc',
meta: {
title: '查看流程',
},
}
]
export default routes
\ No newline at end of file
......@@ -197,7 +197,7 @@ export const us = {
icon:icon_prefix+"qingjia2.png",
description:"请假",
useCount:1000,
page:'ygqj'
page:'cgddsp'
},
{
title:"销售订单审批",
......
......@@ -156,30 +156,25 @@
},{
"path": "pages/annotation/annotationDetail",
"style": {}
},{
"path": "pages/common/helloWorld",
"style": {},
"enablePullDownRefresh": true
}
,
{
"path": "pages/common/ygqj",
"style": {},
"enablePullDownRefresh": true
},
{
"path": "pages/common/qjxq",
"style": {}
},
{
"path": "pages/common/fybx",
"style": {},
"enablePullDownRefresh": true
},
{
"path": "pages/common/fybxxq",
"style": {}
},
// {
// "path": "pages/common/ygqj",
// "style": {},
// "enablePullDownRefresh": true
// },
// {
// "path": "pages/common/qjxq",
// "style": {}
// },
// {
// "path": "pages/common/fybx",
// "style": {},
// "enablePullDownRefresh": true
// },
// {
// "path": "pages/common/fybxxq",
// "style": {}
// },
{
"path" : "pages/process/process",
"style" :
......@@ -217,19 +212,19 @@
"path": "pages/process/wdswfybx",
"style": {}
},
{
"path": "pages/gzrw/gzrwcj",
"style": {},
"enablePullDownRefresh": true
},
{
"path": "pages/gzrw/gzrwedit",
"style": {}
},
{
"path": "pages/gzrw/gzrwxq",
"style": {}
},
// {
// "path": "pages/gzrw/gzrwcj",
// "style": {},
// "enablePullDownRefresh": true
// },
// {
// "path": "pages/gzrw/gzrwedit",
// "style": {}
// },
// {
// "path": "pages/gzrw/gzrwxq",
// "style": {}
// },
{
"path": "pages/addLovedata/addLovedata",
"style": {}
......@@ -253,6 +248,14 @@
{
"path": "pages/lldsp/lldspxq",
"style": {}
},
{
"path": "pages/cgddsp/cgddsp",
"style": {}
},
{
"path": "pages/xsddsp/allcklc",
"style": {}
}
],
"globalStyle": {
......
This diff is collapsed.
......@@ -19,6 +19,7 @@
</view>
</view>
<view class="index">
<view v-if="!showlist[0]" style="background-image: url(/static/sswnr.png);height: 87vh;background-size:100% 80%;"></view>
<view class="new_box" style="margin-top: 0px;">
<view class="bbox">
<view class="list-box" v-for="(item,index) in showlist" :key="index" style="border-bottom: 0.5px solid #EEEEEE;">
......@@ -33,7 +34,7 @@
</view>
</view>
<view class="list-da">
<view>计划部门:<text>{{item.course||"未设定"}}</text></view>
<view>计划部门:<text>{{item.bmmc||"未设定"}}</text></view>
<view>计划日期:<text>{{item.jhrq|formatDate}}</text></view>
</view>
<view class="list-da">
......@@ -531,6 +532,13 @@
},
methods: {
// 重置过滤芯
resetModal(){
this.operatype="W"
this.zt=""
this.ztsta="5"
this.swlxsta="2"
},
// 转交单子api
apizjjh(){
let that=this
......@@ -928,7 +936,7 @@
this.tjsprlist=[]
this.tjsprlistN=[]
this.tjsprlistS=[]
this.tjclyj=[]
this.tjclyj=""
},
// 筛选框
showModal(e) {
......@@ -962,12 +970,10 @@
}
});
},
// 单选
choice(index){
console.log(this.showlist[index].selected)
console.log(index)
if(this.showlist[index].selected == true){
this.showlist[index].selected = false;
//取消选中时删除数组中的值
for(var i = 0; i < this.selectId.length; i++){
if(this.selectId[i].jhid === this.showlist[index].jhid){
this.selectId.splice(i,1);
......@@ -975,21 +981,34 @@
}
console.log("选中的值",this.selectId)
}else{
this.selectId=[]
this.showlist.forEach((e,dex)=>{
if(dex!=index){
this.showlist[dex].selected=false
}
})
this.showlist[index].selected = true;
this.selectId.push(this.showlist[index])
console.log("选中的值",this.selectId)
}
},
//提交
// sure(){
// //提交选中的值
// if(this.selectId.length==0){
// alert("请选择学科");
// return false;
// choice(index){
// console.log(this.showlist[index].selected)
// console.log(index)
// if(this.showlist[index].selected == true){
// this.showlist[index].selected = false;
// for(var i = 0; i < this.selectId.length; i++){
// if(this.selectId[i].jhid === this.showlist[index].jhid){
// this.selectId.splice(i,1);
// }
// }
// var listIds = this.selectId.join(",")
// console.log("提交的数据",listIds)
// console.log("选中的值",this.selectId)
// }else{
// this.showlist[index].selected = true;
// this.selectId.push(this.showlist[index])
// console.log("选中的值",this.selectId)
// }
// },
}
}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -12,7 +12,7 @@
</input>
<view v-if="show" style="width: 90%;background-color:#EEEEEE;position: absolute;top:85%;right: 3%;z-index: 9999;">
<li style="list-style: none;color: #999999;background-color: #F5F5F5;padding-left: 20px;padding-top: 3px;padding-bottom: 5px;border-bottom: 1px solid #FFFFFF;" @tap="goPage(item.page)" v-for="(item,index) in showlist" :key="index">{{item.mkmc}}</li>
<li style="list-style: none;color: #999999;background-color: #F5F5F5;padding-left: 20px;padding-top: 3px;padding-bottom: 5px;border-bottom: 1px solid #FFFFFF;" @tap="goPage(item.page)" v-for="(item,index) in showlist" :key="index">{{item.title}}</li>
</view>
</view>
......@@ -165,9 +165,10 @@
},
},
searchKey(d){
console.log(this.usList)
this.showlist=[]
this.loveList.forEach(e=>{
if(e.mkmc.indexOf(d)!=-1){
this.usList.forEach(e=>{
if(e.title.indexOf(d)!=-1){
this.showlist.push(e)
}
})
......
......@@ -11,7 +11,7 @@
<view class="container">
<view class="cu-bar bg-white search" >
<view class="example-body">
<uni-search-bar placeholder="搜索任务单号" @input="searchinput"></uni-search-bar>
<uni-search-bar placeholder="搜索领料单号" @input="searchinput"></uni-search-bar>
</view>
<view class="action" style="margin-right: 8px;">
<text class="cu-btn round search-btn" @tap="showModal" data-target="bottomModal">
......@@ -19,6 +19,7 @@
</view>
</view>
<view class="index">
<view v-if="!showlist[0]" style="background-image: url(/static/sswnr.png);height: 87vh;background-size:100% 80%;"></view>
<view class="new_box" style="margin-top: 0px;">
<view class="bbox">
<view class="list-box" v-for="(item,index) in showlist" :key="index" style="border-bottom: 0.5px solid #EEEEEE;">
......@@ -38,7 +39,7 @@
</view>
<view class="list-da">
<view>事务类型:<text>{{item.swlxmc}}</text></view>
<view>仓库:<text>{{item.ckmk||"未设"}}</text></view>
<view>仓库:<text>{{item.ckmc||"未设"}}</text></view>
</view>
<view class="list-da">
<view>领料日期:<text>{{item.llrq|formatDate}}</text></view>
......@@ -537,6 +538,13 @@
},
methods: {
// 重置过滤芯
resetModal(){
this.operatype="W"
this.zt=""
this.ztsta="5"
this.swlxsta="2"
},
// 转交单子api
apizjjh(){
let that=this
......@@ -888,7 +896,7 @@
})
},
searchinput(e){
this.jhid=e
this.djid=e
this.pageNo=1
this.showlist=[]
this.selectId=[]
......@@ -934,7 +942,7 @@
this.tjsprlist=[]
this.tjsprlistN=[]
this.tjsprlistS=[]
this.tjclyj=[]
this.tjclyj=""
},
// 筛选框
showModal(e) {
......@@ -968,12 +976,10 @@
}
});
},
// 单选
choice(index){
console.log(this.showlist[index].selected)
console.log(index)
if(this.showlist[index].selected == true){
this.showlist[index].selected = false;
//取消选中时删除数组中的值
for(var i = 0; i < this.selectId.length; i++){
if(this.selectId[i].jhid === this.showlist[index].jhid){
this.selectId.splice(i,1);
......@@ -981,21 +987,35 @@
}
console.log("选中的值",this.selectId)
}else{
this.selectId=[]
this.showlist.forEach((e,dex)=>{
if(dex!=index){
this.showlist[dex].selected=false
}
})
this.showlist[index].selected = true;
this.selectId.push(this.showlist[index])
console.log("选中的值",this.selectId)
}
},
//提交
// sure(){
// //提交选中的值
// if(this.selectId.length==0){
// alert("请选择学科");
// return false;
// choice(index){
// console.log(this.showlist[index].selected)
// console.log(index)
// if(this.showlist[index].selected == true){
// this.showlist[index].selected = false;
// //取消选中时删除数组中的值
// for(var i = 0; i < this.selectId.length; i++){
// if(this.selectId[i].jhid === this.showlist[index].jhid){
// this.selectId.splice(i,1);
// }
// }
// var listIds = this.selectId.join(",")
// console.log("提交的数据",listIds)
// console.log("选中的值",this.selectId)
// }else{
// this.showlist[index].selected = true;
// this.selectId.push(this.showlist[index])
// console.log("选中的值",this.selectId)
// }
// },
}
}
......
This diff is collapsed.
......@@ -11,7 +11,7 @@
<view class="container">
<view class="cu-bar bg-white search">
<view class="example-body">
<uni-search-bar placeholder="搜索任务单号" @input="searchinput"></uni-search-bar>
<uni-search-bar placeholder="搜索销售单号" @input="searchinput"></uni-search-bar>
</view>
<view class="action" style="margin-right: 8px;">
<text class="cu-btn round search-btn" @tap="showModal" data-target="bottomModal">
......@@ -19,6 +19,7 @@
</view>
</view>
<view class="index">
<view v-if="!showlist[0]" style="background-image: url(/static/sswnr.png);height: 87vh;background-size:100% 80%;"></view>
<view class="new_box" style="margin-top: 0px;">
<view class="bbox">
<view class="list-box" v-for="(item,index) in showlist" :key="index"
......@@ -44,10 +45,10 @@
</view>
<view class="list-da">
<view>销售数量:<text>{{item.xssl}}</text></view>
<view>销售金额:<text>{{item.xsje}}</text></view>
<view>销售金额:<text>{{item.hsje}}</text></view>
</view>
<view class="list-da">
<view>销售价格:<text>{{item.xsjg||"未设定"}}</text></view>
<view>销售价格:<text>{{item.hsjg}}</text></view>
<view>增值税率:<text>{{item.zzsl}}</text></view>
</view>
<view class="list-da">
......@@ -59,16 +60,19 @@
<view>销售人员:<text>{{item.xsyname}}</text></view>
</view>
<view class="">
<view>
订单日期:{{item.ywrq|formatDate}}
</view>
<view>备注:<text>{{item.bz||"未设定"}}</text></view>
</view>
<view class="list-da" style="padding-top: 10px;margin-bottom: 0px;">
<view class="flex justify-between" style="padding-top: 10px;margin-bottom: 0px;">
<view>状态:
<text style="color:#FBBD08;">
{{item.zt|filterzt}}
</text>
</view>
<view>
订单日期:{{item.ywrq|formatDate}}
<view style="color: #007AFF;" @click="nextTo(item)">
查看流程
</view>
</view>
</view>
......@@ -549,7 +553,7 @@
start: "",
zt: "",
// 筛选状态
ztsta: "5",
ztsta: "4",
swlxsta: "2",
username: "",
selectBxlx: "",
......@@ -597,6 +601,13 @@
},
methods: {
// 重置过滤芯
resetModal(){
this.operatype="W"
this.zt=""
this.ztsta="4"
this.swlxsta="2"
},
// 转交单子api
apizjjh() {
let that = this
......@@ -949,7 +960,7 @@
},
nextTo(item) {
this.$Router.push({
path: '/pages/cgjh/cgjhxq',
path: '/pages/xsddsp/allcklc',
query: {
infor: item
},
......@@ -1013,7 +1024,7 @@
this.tjsprlist = []
this.tjsprlistN = []
this.tjsprlistS = []
this.tjclyj = []
this.tjclyj = ""
},
// 筛选框
showModal(e) {
......@@ -1047,32 +1058,43 @@
}
});
},
choice(index) {
if (this.showlist[index].selected == true) {
// 单选
choice(index){
if(this.showlist[index].selected == true){
this.showlist[index].selected = false;
//取消选中时删除数组中的值
for (var i = 0; i < this.selectId.length; i++) {
if (this.selectId[i].soid === this.showlist[index].soid) {
this.selectId.splice(i, 1);
for(var i = 0; i < this.selectId.length; i++){
if(this.selectId[i].jhid === this.showlist[index].jhid){
this.selectId.splice(i,1);
}
}
} else {
console.log("选中的值",this.selectId)
}else{
this.selectId=[]
this.showlist.forEach((e,dex)=>{
if(dex!=index){
this.showlist[dex].selected=false
}
})
this.showlist[index].selected = true;
this.selectId.push(this.showlist[index])
console.log("选中的值",this.selectId)
}
console.log(this.selectId)
},
//提交
// sure(){
// //提交选中的值
// if(this.selectId.length==0){
// alert("请选择学科");
// return false;
// choice(index) {
// if (this.showlist[index].selected == true) {
// this.showlist[index].selected = false;
// for (var i = 0; i < this.selectId.length; i++) {
// if (this.selectId[i].soid === this.showlist[index].soid) {
// this.selectId.splice(i, 1);
// }
// }
// var listIds = this.selectId.join(",")
// console.log("提交的数据",listIds)
// } else {
// this.showlist[index].selected = true;
// this.selectId.push(this.showlist[index])
// }
// console.log(this.selectId)
// },
}
}
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment