|
|
@@ -74,20 +74,100 @@
|
|
|
</el-col>
|
|
|
</template>
|
|
|
<el-col :span="8">
|
|
|
+ <el-form-item label="销售类型" :required="true" style="padding-bottom: 1px;">
|
|
|
+ <el-radio-group v-model="formData.salesType">
|
|
|
+ <el-radio disabled label="零售">零售</el-radio>
|
|
|
+ <el-radio disabled label="工程">工程</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item label="销售订单号" :required="true">
|
|
|
<el-input type="text" v-model="formData.salesId" :disabled="formType == 2" @change="getDetail" placeholder="请输入销售订单号"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="5">
|
|
|
<el-form-item label="销售金额">
|
|
|
<el-input type="text" :value="formData.totalAmount" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="6">
|
|
|
+ <el-col :span="5">
|
|
|
<el-form-item label="时间">
|
|
|
<el-input type="text" :value="formData.payTime" disabled></el-input>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <template v-if="formData.salesType == '工程'">
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="工程名称" :required="true">
|
|
|
+ <el-input type="text" :value="formData.projectName" disabled></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="工程编号" :required="true">
|
|
|
+ <el-input type="text" :disabled="true" v-model="formData.projectNo" placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="负责人" :required="true">
|
|
|
+ <el-input type="text" :disabled="true" v-model="formData.manger" placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="联系电话" :required="true">
|
|
|
+ <el-input type="text" :disabled="true" v-model="formData.mobile" placeholder="请输入"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6">
|
|
|
+ <el-form-item label="项目时间" :required="true">
|
|
|
+ <el-date-picker
|
|
|
+ style="width:50%"
|
|
|
+ v-model="formData.startTime"
|
|
|
+ type="date"
|
|
|
+ :disabled="true"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="开始日期">
|
|
|
+ </el-date-picker>
|
|
|
+ <el-date-picker
|
|
|
+ style="width:50%"
|
|
|
+ v-model="formData.endTime"
|
|
|
+ type="date"
|
|
|
+ :disabled="true"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ placeholder="结束日期">
|
|
|
+ </el-date-picker>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="项目地址" prop="province" :required="true">
|
|
|
+ <el-row>
|
|
|
+ <el-col :span="5" style="margin-right: 12px;">
|
|
|
+ <el-input type="text" v-model="formData.province" disabled placeholder="请选择省"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5" style="margin-right: 12px;">
|
|
|
+ <el-input type="text" v-model="formData.city" disabled placeholder="请选择市"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="5" style="margin-right: 12px;">
|
|
|
+ <el-input type="text" v-model="formData.area" disabled placeholder="请选择区"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
+ <el-input type="text" v-model="formData.street" disabled placeholder="请选择街道"></el-input>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="" prop="address">
|
|
|
+ <el-row :gutter="20">
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-input type="text" v-model="formData.address" :disabled="true" placeholder="详细地址"></el-input>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="2">
|
|
|
+ <geographicalPosi :disabled="formType==2" :formData="this.formData" @selectPosi="selectAddress"/>
|
|
|
+ </el-col> -->
|
|
|
+ </el-row>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </template>
|
|
|
<el-col :span="6" v-if="id">
|
|
|
<el-form-item label="制单人">
|
|
|
<el-input type="text" :value="formData.createBy" disabled></el-input>
|
|
|
@@ -283,7 +363,20 @@
|
|
|
workerMobile: '',
|
|
|
remark: '',
|
|
|
totalAmount: '',
|
|
|
- orderUseType: 'INSIDE'
|
|
|
+ orderUseType: 'INSIDE',
|
|
|
+ salesType: '零售',
|
|
|
+ province: '',
|
|
|
+ provinceId: '',
|
|
|
+ city: '',
|
|
|
+ cityId: '',
|
|
|
+ area: '',
|
|
|
+ areaId: '',
|
|
|
+ street: '',
|
|
|
+ streetId: '',
|
|
|
+ address: '',
|
|
|
+ lat: '',
|
|
|
+ lng: '',
|
|
|
+ orderEnginBaseId: '',
|
|
|
},
|
|
|
isEdit: 0,
|
|
|
companyName: JSON.parse(localStorage.getItem('greemall_user')).companyName,
|
|
|
@@ -369,14 +462,14 @@
|
|
|
const that = this
|
|
|
if(type == 1){
|
|
|
return new Promise((resolve, reject) => {
|
|
|
- getGoods({websitId: this.formData.websitId,type: 'P',goodsName: goodsName}).then(res => {
|
|
|
+ getGoods({websitId: this.formData.websitId,type: 'P',goodsName: goodsName,orderEnginBaseId: this.formData.orderEnginBaseId,saleType: this.formData.salesType}).then(res => {
|
|
|
resolve({
|
|
|
data: res.data[0]
|
|
|
})
|
|
|
})
|
|
|
})
|
|
|
}else{
|
|
|
- getGoods({websitId: this.formData.websitId,type: 'P'}).then(res => {
|
|
|
+ getGoods({websitId: this.formData.websitId,type: 'P',orderEnginBaseId: this.formData.orderEnginBaseId,saleType: this.formData.salesType}).then(res => {
|
|
|
that.dataList[that.isEdit].goodsList = res.data
|
|
|
console.log(this.dataList)
|
|
|
})
|
pengyh