|
|
@@ -148,152 +148,134 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
- <template v-if="!form.calenderId">
|
|
|
- <el-form-item
|
|
|
- label="收入类型"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- :rules="[
|
|
|
- { required: true, message: '请选收入类型', trigger: 'change' }
|
|
|
- ]"
|
|
|
- prop="applyType"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- class="multiple"
|
|
|
- style="width: 100% !important"
|
|
|
- v-model.trim="form.applyType"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- :disabled="!isAdd"
|
|
|
- placeholder="请选择收入类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item, index) in orderServerList"
|
|
|
- :key="index"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="销售金额"
|
|
|
- prop="saleAmount"
|
|
|
- :rules="[
|
|
|
- { required: true, message: '请输入销售金额', trigger: 'change' }
|
|
|
- ]"
|
|
|
- v-if="form.applyType == 'SELL'"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model="form.saleAmount"
|
|
|
- @mousewheel.native.prevent
|
|
|
- type="number"
|
|
|
- :disabled="!isAdd"
|
|
|
- placeholder="请输入销售金额"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="服务金额"
|
|
|
- v-if="form.applyType == 'SERVICE'"
|
|
|
- :rules="[
|
|
|
- { required: true, message: '请输入服务金额', trigger: 'change' }
|
|
|
- ]"
|
|
|
- prop="serviceAmount"
|
|
|
- :label-width="formLabelWidth"
|
|
|
+ <el-form-item
|
|
|
+ label="收入类型"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '请选收入类型', trigger: 'change' }
|
|
|
+ ]"
|
|
|
+ prop="applyType"
|
|
|
+ >
|
|
|
+ <el-select
|
|
|
+ class="multiple"
|
|
|
+ style="width: 100% !important"
|
|
|
+ v-model.trim="form.applyType"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ :disabled="!isAdd"
|
|
|
+ placeholder="请选择收入类型"
|
|
|
>
|
|
|
- <el-input
|
|
|
- type="number"
|
|
|
- @mousewheel.native.prevent
|
|
|
- :disabled="!isAdd"
|
|
|
- v-model="form.serviceAmount"
|
|
|
- placeholder="请输入收入金额"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
- <div v-if="form.applyType == 'SELL'">
|
|
|
- <div
|
|
|
- v-for="(goodsList, index) in form.goodsList"
|
|
|
+ <el-option
|
|
|
+ v-for="(item, index) in orderServerList"
|
|
|
:key="index"
|
|
|
- class="shopListWrap"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="销售金额"
|
|
|
+ prop="saleAmount"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '请输入销售金额', trigger: 'change' }
|
|
|
+ ]"
|
|
|
+ v-if="form.applyType == 'SELL'"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ v-model="form.saleAmount"
|
|
|
+ @mousewheel.native.prevent
|
|
|
+ type="number"
|
|
|
+ :disabled="!isAdd"
|
|
|
+ placeholder="请输入销售金额"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="服务金额"
|
|
|
+ v-if="form.applyType == 'SERVICE'"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '请输入服务金额', trigger: 'change' }
|
|
|
+ ]"
|
|
|
+ prop="serviceAmount"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="number"
|
|
|
+ @mousewheel.native.prevent
|
|
|
+ :disabled="!isAdd"
|
|
|
+ v-model="form.serviceAmount"
|
|
|
+ placeholder="请输入收入金额"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <div v-if="form.applyType == 'SELL'">
|
|
|
+ <div
|
|
|
+ v-for="(goodsList, index) in form.goodsList"
|
|
|
+ :key="index"
|
|
|
+ class="shopListWrap"
|
|
|
+ >
|
|
|
+ <el-form-item
|
|
|
+ :label="'商品名称' + (index + 1)"
|
|
|
+ :label-width="formLabelWidth"
|
|
|
+ class="setWidth"
|
|
|
+ :prop="'goodsList.' + index + '.id'"
|
|
|
+ :rules="[
|
|
|
+ { required: true, message: '请选择商品', trigger: 'change' }
|
|
|
+ ]"
|
|
|
>
|
|
|
- <el-form-item
|
|
|
- :label="'商品名称' + (index + 1)"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- class="setWidth"
|
|
|
- :prop="'goodsList.' + index + '.id'"
|
|
|
- :rules="[
|
|
|
- { required: true, message: '请选择商品', trigger: 'change' }
|
|
|
- ]"
|
|
|
- >
|
|
|
- <el-select
|
|
|
- v-if="isAdd"
|
|
|
- v-model.trim="goodsList.id"
|
|
|
- filterable
|
|
|
- :disabled="!isAdd"
|
|
|
- placeholder="请选择商品"
|
|
|
- :popper-append-to-body="false"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- :title="item.name"
|
|
|
- v-for="(item, index) in shopList"
|
|
|
- :key="index"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
- </el-select>
|
|
|
- <p class="showShop" v-else>
|
|
|
- <Tooltip :content="goodsList.id | filterShopId" />
|
|
|
- </p>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- class="setWidth"
|
|
|
- style="margin-right: 10px;margin-left: 10px;"
|
|
|
- :prop="'goodsList.' + index + '.number'"
|
|
|
- >
|
|
|
- <!-- :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
|
|
|
- <el-input
|
|
|
- type="age"
|
|
|
- style="width: 160px"
|
|
|
- :disabled="!isAdd"
|
|
|
- clearable
|
|
|
- placeholder="请输入商品数量"
|
|
|
- @mousewheel.native.prevent
|
|
|
- v-model.number="goodsList.number"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-button
|
|
|
- icon="el-icon-minus"
|
|
|
+ <el-select
|
|
|
+ v-if="isAdd"
|
|
|
+ v-model.trim="goodsList.id"
|
|
|
+ filterable
|
|
|
:disabled="!isAdd"
|
|
|
- v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
|
|
|
- style="margin-bottom: 22px;"
|
|
|
- circle
|
|
|
- @click.prevent="removeGoodsList(goodsList)"
|
|
|
- ></el-button>
|
|
|
- <el-button
|
|
|
- icon="el-icon-plus"
|
|
|
+ placeholder="请选择商品"
|
|
|
+ :popper-append-to-body="false"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ :title="item.name"
|
|
|
+ v-for="(item, index) in shopList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ <p class="showShop" v-else>
|
|
|
+ <Tooltip :content="goodsList.id | filterShopId" />
|
|
|
+ </p>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ class="setWidth"
|
|
|
+ style="margin-right: 10px;margin-left: 10px;"
|
|
|
+ :prop="'goodsList.' + index + '.number'"
|
|
|
+ >
|
|
|
+ <!-- :rules="validAmount" <el-input-number style="width: 160px;" v-model="goodsList.number" placeholder="商品数量"></el-input-number> -->
|
|
|
+ <el-input
|
|
|
+ type="age"
|
|
|
+ style="width: 160px"
|
|
|
:disabled="!isAdd"
|
|
|
- v-if="auditStatus == 'REJECT'"
|
|
|
- @click.prevent="addGoodsList"
|
|
|
- circle
|
|
|
- style="margin-left: 5px; margin-bottom: 22px;"
|
|
|
- ></el-button>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </template>
|
|
|
- <div v-if="form.calenderId">
|
|
|
- <el-form-item
|
|
|
- label="回款金额"
|
|
|
- prop="routeAmount"
|
|
|
- :label-width="formLabelWidth"
|
|
|
- :rules="[{ required: true, message: '请输入回款金额' }]"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="number"
|
|
|
- @mousewheel.native.prevent
|
|
|
+ clearable
|
|
|
+ placeholder="请输入商品数量"
|
|
|
+ @mousewheel.native.prevent
|
|
|
+ v-model.number="goodsList.number"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-minus"
|
|
|
:disabled="!isAdd"
|
|
|
- v-model="form.routeAmount"
|
|
|
- placeholder="请输入回款金额"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
+ v-if="form.goodsList.length > 1 && auditStatus == 'REJECT'"
|
|
|
+ style="margin-bottom: 22px;"
|
|
|
+ circle
|
|
|
+ @click.prevent="removeGoodsList(goodsList)"
|
|
|
+ ></el-button>
|
|
|
+ <el-button
|
|
|
+ icon="el-icon-plus"
|
|
|
+ :disabled="!isAdd"
|
|
|
+ v-if="auditStatus == 'REJECT'"
|
|
|
+ @click.prevent="addGoodsList"
|
|
|
+ circle
|
|
|
+ style="margin-left: 5px; margin-bottom: 22px;"
|
|
|
+ ></el-button>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="lookTitle">其它</div>
|
|
|
<el-form-item
|
|
|
@@ -381,8 +363,7 @@ export default {
|
|
|
applyType: null,
|
|
|
userId: "",
|
|
|
auditComment: "",
|
|
|
- calenderId: "",
|
|
|
- routeAmount: null
|
|
|
+ calenderId: ""
|
|
|
},
|
|
|
isAdd: !this.isLook,
|
|
|
insertOrderType: 1, // 订单类型 1 个人订单 2 学校订单 2 其它订单
|
|
|
@@ -414,7 +395,6 @@ export default {
|
|
|
memo: orderInfo.memo,
|
|
|
payTime: orderInfo.payTime,
|
|
|
serviceAmount: orderInfo.serviceAmount,
|
|
|
- routeAmount: orderInfo.routeAmount,
|
|
|
saleAmount: orderInfo.saleAmount,
|
|
|
schoolId: orderInfo.schoolId,
|
|
|
userId: orderInfo.userId ? orderInfo.userId : "",
|
