|
|
@@ -10,36 +10,36 @@
|
|
|
</label>
|
|
|
</radio-group>
|
|
|
</view>
|
|
|
- <template v-if="type === 0">
|
|
|
+ <template v-if="type === 1">
|
|
|
<view class="item">
|
|
|
<view class="item-tit">捐赠单位<text>*</text></view>
|
|
|
- <input type="text" :value="unit" placeholder="请填写捐赠单位"/>
|
|
|
+ <input type="text" v-model="unit" placeholder="请填写捐赠单位"/>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-tit">单位联系人<text>*</text></view>
|
|
|
- <input type="text" :value="dwPeople" placeholder="请填写捐赠方联系人"/>
|
|
|
+ <input type="text" v-model="contacts" placeholder="请填写捐赠方联系人"/>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-tit">单位电话<text>*</text></view>
|
|
|
- <input type="text" :value="dwPhone" placeholder="请填写单位联系方式"/>
|
|
|
+ <input type="text" v-model="tel" placeholder="请填写单位联系方式"/>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-tit">企业信用代码</view>
|
|
|
- <input type="text" :value="qyxydm" placeholder="请填写单位的企业信用代码"/>
|
|
|
+ <input type="text" v-model="qyxydm" placeholder="请填写单位的企业信用代码"/>
|
|
|
</view>
|
|
|
</template>
|
|
|
- <template v-if="type === 1">
|
|
|
+ <template v-if="type === 0">
|
|
|
<view class="item">
|
|
|
<view class="item-tit">姓名<text>*</text></view>
|
|
|
- <input type="text" :value="unit" placeholder="请填写您的姓名"/>
|
|
|
+ <input type="text" v-model="name" placeholder="请填写您的姓名"/>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-tit">联系方式<text>*</text></view>
|
|
|
- <input type="text" :value="unit" placeholder="请填写您的联系方式"/>
|
|
|
+ <input type="text" v-model="phone" placeholder="请填写您的联系方式"/>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
<view class="item-tit">身份证号</view>
|
|
|
- <input type="text" :value="unit" placeholder="请填写您的身份证号"/>
|
|
|
+ <input type="text" v-model="identityNumber" placeholder="请填写您的身份证号"/>
|
|
|
</view>
|
|
|
</template>
|
|
|
<view class="item">
|
|
|
@@ -56,8 +56,8 @@
|
|
|
</radio-group>
|
|
|
</view>
|
|
|
<view class="item">
|
|
|
- <view class="item-tit">物流方式</view>
|
|
|
- <picker @change="bindLogChange(item)" :range="logs">
|
|
|
+ <view class="item-tit">物流方式<text>*</text></view>
|
|
|
+ <picker @change="bindLogChange" :range="logs" range-key="name">
|
|
|
<view class="log select" :class="{'action': log }">{{ log || '请选择物流方式' }}</view>
|
|
|
</picker>
|
|
|
</view>
|
|
|
@@ -82,10 +82,10 @@
|
|
|
<view class="item-tit">捐赠物资<text>*</text></view>
|
|
|
<view class="choose-box">
|
|
|
<view class="choose-item" v-for="(item,index) in wzList" :key="index" @click="dianji(index)">
|
|
|
- <picker @change="bindWzChange" :range="wzs">
|
|
|
- <view class="wz select" :class="{'action': item.wzname }">{{ item.wzname }}</view>
|
|
|
+ <picker @change="bindWzChange" :range="wzs" range-key="name">
|
|
|
+ <view class="wz select" :class="{'action': item.project_donation_name }">{{ item.project_donation_name || '请选择物资分类' }}</view>
|
|
|
</picker>
|
|
|
- <input type="number" v-model="item.num" placeholder="填写数量"/>
|
|
|
+ <input type="number" v-model="item.project_donation_num" placeholder="填写数量"/>
|
|
|
</view>
|
|
|
<view class="more" @click="addMore">
|
|
|
+添加更多
|
|
|
@@ -105,7 +105,7 @@
|
|
|
</template>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="t-item" v-if="type === 0">
|
|
|
+ <!-- <view class="t-item" v-if="type === 1">
|
|
|
<view class="t-tit">
|
|
|
营业执照(必填)<text>{{yyimg | much}}/3</text>
|
|
|
</view>
|
|
|
@@ -115,7 +115,7 @@
|
|
|
<image :src="item" mode="" v-if="item" @click.stop="imgsub(yyimg,index)" :key="index"></image>
|
|
|
</template>
|
|
|
</view>
|
|
|
- </view>
|
|
|
+ </view> -->
|
|
|
<view class="t-item">
|
|
|
<view class="t-tit">
|
|
|
质量合格书(必填)<text>{{zlimg | much}}/3</text>
|
|
|
@@ -158,26 +158,29 @@
|
|
|
|
|
|
<script>
|
|
|
import { upload } from '@/api/ask.js';
|
|
|
+ import { getProjectInfo, createProject, getLogistics, getDonationInfo, createUser } from '../../api/money.js';
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
items: [
|
|
|
{
|
|
|
- value: '企业（团体）',
|
|
|
+ value: '个人',
|
|
|
iid: '0'
|
|
|
},
|
|
|
{
|
|
|
- value: '个人',
|
|
|
+ value: '企业（团体）',
|
|
|
iid: '1'
|
|
|
}
|
|
|
],
|
|
|
IsAnonymous: false,
|
|
|
limit: 1,
|
|
|
- type: 0,//捐赠个体 1位个人 0为团体（企业）
|
|
|
+ type: 0,//捐赠个体0位个人 1为团体（企业）
|
|
|
unit: '',//捐赠单位
|
|
|
- dwPeople: '',//捐赠方联系人
|
|
|
- dwPhone: '',//单位电话
|
|
|
+ contacts: '',//捐赠方联系人
|
|
|
+ tel: '',//单位电话
|
|
|
log: '',//物流方式
|
|
|
+ logistics: '',//物流编号
|
|
|
+ // Logistics: '',//物流方式id
|
|
|
logs: ['顺丰','邮政'],
|
|
|
Isopen: false,//是否开具发票
|
|
|
mask: '',//备注
|
|
|
@@ -185,21 +188,21 @@
|
|
|
name: '',// 捐赠人姓名
|
|
|
phone: '',//捐赠人联系方式
|
|
|
identityNumber: '',//身份证号
|
|
|
- wzs: ['帐篷类（帐篷）','棉被类(被子)'],
|
|
|
+ wzs: [],//物资分类列表
|
|
|
wzList: [
|
|
|
{
|
|
|
- wzname: '帐篷类（帐篷）',
|
|
|
- num: null
|
|
|
- },
|
|
|
- {
|
|
|
- wzname: '棉被类(被子)',
|
|
|
- num: null
|
|
|
+ project_donation_id: null,
|
|
|
+ project_donation_num: null,
|
|
|
+ project_donation_name: null
|
|
|
}
|
|
|
],
|
|
|
swimg: [''],//实物照片
|
|
|
yyimg: [''],//营业执照
|
|
|
zlimg: [''],//质量合格证书
|
|
|
jzimg: [''],//价值凭证
|
|
|
+ true_wzList: [],//最终捐赠的物资列表
|
|
|
+ hadadd: [],//已添加分类
|
|
|
+ project_id: 0,//项目ID
|
|
|
}
|
|
|
},
|
|
|
filters:{
|
|
|
@@ -218,7 +221,11 @@
|
|
|
this.type = ops.type*1
|
|
|
console.log(this.type,'++++++++')
|
|
|
}
|
|
|
-
|
|
|
+ if(ops.id) {
|
|
|
+ this.project_id = ops.id*1
|
|
|
+ }
|
|
|
+ this.getDonationInfo()
|
|
|
+ this.getLogistics()
|
|
|
},
|
|
|
mounted() {
|
|
|
// this.$set(this,'wzList',[this.wz1,this.wz2])
|
|
|
@@ -235,7 +242,7 @@
|
|
|
//选择捐赠是个人或团体
|
|
|
typeChange(e) {
|
|
|
this.type = e.detail.value*1
|
|
|
- console.log(this.type)
|
|
|
+ console.log(this.type,'this.typ+++++++++++++++++++++')
|
|
|
},
|
|
|
//选择是否匿名
|
|
|
anonymousChange(e) {
|
|
|
@@ -247,9 +254,24 @@
|
|
|
},
|
|
|
//选择物流方式
|
|
|
bindLogChange(e) {
|
|
|
- this.log = this.logs[e.detail.value*1]
|
|
|
+ this.log = this.logs[e.detail.value].name
|
|
|
+ this.logistics = this.logs[e.detail.value].id
|
|
|
+ },
|
|
|
+ //选择捐献物资分类
|
|
|
+ bindWzChange(e){
|
|
|
+ if(this.hadadd.indexOf(e.detail.value) === -1) {
|
|
|
+ this.hadadd.push(e.detail.value)
|
|
|
+ this.wzList[this.currentWzIndex].project_donation_name = this.wzs[e.detail.value].name
|
|
|
+ this.wzList[this.currentWzIndex].project_donation_id = this.wzs[e.detail.value].id
|
|
|
+ }else {
|
|
|
+ this.$api.msg('改分类已添加');
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ console.log(this.wzList)
|
|
|
+ // this.wz = this.logs[e.detail.value].name
|
|
|
+
|
|
|
},
|
|
|
- //
|
|
|
openChange(e) {
|
|
|
if(e.detail.value !== '1') {
|
|
|
this.Isopen = false
|
|
|
@@ -270,31 +292,127 @@
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- //选择捐献物资分类
|
|
|
- bindWzChange(e){
|
|
|
- // item.wzname = e.detail.value
|
|
|
- // console.log(item)
|
|
|
- this.wzList[this.currentWzIndex].wzname = this.wzs[e.detail.value]
|
|
|
- console.log(this.wzList)
|
|
|
-
|
|
|
- },
|
|
|
+
|
|
|
dianji(index) {
|
|
|
this.currentWzIndex = index
|
|
|
},
|
|
|
//添加更多
|
|
|
addMore() {
|
|
|
this.wzList.push({
|
|
|
- wzname: this.wzs[0],
|
|
|
- num: null
|
|
|
+ project_donation_id: null,
|
|
|
+ project_donation_num: null,
|
|
|
+ project_donation_name: null
|
|
|
})
|
|
|
},
|
|
|
//提交
|
|
|
sub() {
|
|
|
- uni.navigateTo({
|
|
|
- url: '/pages/joinSuc/joinsuccess'
|
|
|
+ // uni.navigateTo({
|
|
|
+ // url: '/pages/joinSuc/joinsuccess'
|
|
|
+ // })
|
|
|
+
|
|
|
+ let obj = this;
|
|
|
+
|
|
|
+ if(obj.type === 0) {
|
|
|
+ if (obj.name == '') {
|
|
|
+ obj.$api.msg('请输入您的姓名');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ const reg = /^(\+?0?86-?)?1[\d]\d{9}$/;
|
|
|
+ if (!reg.test(obj.phone)) {
|
|
|
+ obj.$api.msg('请填写正确的手机号码');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+
|
|
|
+ }else {
|
|
|
+ if(obj.unit =='') {
|
|
|
+ obj.$api.msg('请输入捐赠单位');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(obj.dwPeople =='') {
|
|
|
+ obj.$api.msg('请输入联系人');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ if(obj.tel == '') {
|
|
|
+ obj.$api.msg('请输入单位电话');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if(obj.log == '') {
|
|
|
+ obj.$api.msg('请选择物流方式');
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ try{
|
|
|
+ obj.wzList.forEach( item => {
|
|
|
+ if(!item.project_donation_id){
|
|
|
+ throw '请选择物资类别'
|
|
|
+ }
|
|
|
+ if(!item.project_donation_num || item.project_donation_num == 0) {
|
|
|
+ throw '请填写捐赠数量'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }catch(e) {
|
|
|
+ obj.$api.msg(e);
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ let matter =obj.swimg.toString().replace(/,$/,''),
|
|
|
+ qc = obj.zlimg.toString().replace(/,$/,''),
|
|
|
+ worth = obj.jzimg.toString().replace(/,$/,''),
|
|
|
+ item = obj.wzList
|
|
|
+ if(matter== ''){
|
|
|
+ obj.$api.msg('请上传实物照片');
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ if(qc == ''){
|
|
|
+ obj.$api.msg('请上传质量合格证书');
|
|
|
+ return
|
|
|
+ }
|
|
|
+ console.log(matter,'5555555555555555')
|
|
|
+ createUser({
|
|
|
+ name: obj.type === 0? obj.name: obj.unit,
|
|
|
+ phone: obj.phone,
|
|
|
+ tel: obj.tel,
|
|
|
+ contacts: obj.contacts,
|
|
|
+ user_type: obj.type,
|
|
|
+ logistics: obj.logistics,
|
|
|
+ anonymous: obj.IsAnonymous? 1:0,
|
|
|
+ invoice: obj.Isopen? 1:0
|
|
|
+ }).then( res => {
|
|
|
+ console.log(JSON.parse(res.msg),'99999999999999999999999999')
|
|
|
+ let info = JSON.parse(res.msg)
|
|
|
+ console.log(info.name,'8888888888888')
|
|
|
+ createProject({
|
|
|
+ name: obj.type === 0? obj.name: obj.unit,
|
|
|
+ project_id: obj.project_id,
|
|
|
+ project_user_id: +info.id,
|
|
|
+ matter,
|
|
|
+ qc,
|
|
|
+ worth,
|
|
|
+ item
|
|
|
+ }).then( res => {
|
|
|
+ console.log(JSON.parse(res.msg),'77777777777777777777')
|
|
|
+
|
|
|
+ })
|
|
|
+ })
|
|
|
+
|
|
|
+ },
|
|
|
+ //获取物资分类列表
|
|
|
+ getDonationInfo() {
|
|
|
+ getDonationInfo().then(({data} )=>{
|
|
|
+
|
|
|
+ this.wzs = data
|
|
|
+ console.log(this.wzs,'获取所有物资')
|
|
|
+ })
|
|
|
+ },
|
|
|
+ getLogistics() {
|
|
|
+ getLogistics().then( ({data}) => {
|
|
|
+ console.log('88888888888888888888',data)
|
|
|
+ this.logs = data
|
|
|
})
|
|
|
}
|
|
|
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
</script>
|
2312970463@qq.com