|
@@ -363,21 +363,8 @@
|
|
<div class="optBody">
|
|
<div class="optBody">
|
|
<div class="btnBody" v-if="role=='designLeader'">
|
|
<div class="btnBody" v-if="role=='designLeader'">
|
|
<a-button type='primary' @click="confirmOrder" :loading='confirmOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">确定订单</a-button>
|
|
<a-button type='primary' @click="confirmOrder" :loading='confirmOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">确定订单</a-button>
|
|
- <a-popover
|
|
|
|
- title="驳回"
|
|
|
|
- trigger="click"
|
|
|
|
- >
|
|
|
|
- <div slot="content">
|
|
|
|
- <a-textarea
|
|
|
|
- v-model="orderAdvice"
|
|
|
|
- placeholder="请填写驳回理由"
|
|
|
|
- :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
- />
|
|
|
|
- <a @click="rejectOrder" style="margin-top:30px;text-align:right">确定驳回</a>
|
|
|
|
- </div>
|
|
|
|
- <a-button type='default' :loading='rejectOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">驳回订单</a-button>
|
|
|
|
- </a-popover>
|
|
|
|
-
|
|
|
|
|
|
+ <a-button type='default' @click="()=>{orderRejectVisiable=true}" :loading='rejectOrderBtnLoading' v-if="currentOrderInfo.orderStatus==0">
|
|
|
|
+ 驳回订单</a-button>
|
|
</div>
|
|
</div>
|
|
<div class="btnBody" v-if="role=='operator'">
|
|
<div class="btnBody" v-if="role=='operator'">
|
|
<a-popconfirm
|
|
<a-popconfirm
|
|
@@ -406,7 +393,22 @@
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
-
|
|
|
|
|
|
+ <a-modal v-model="orderRejectVisiable" title="订单驳回" width='600px'>
|
|
|
|
+ <template slot="footer">
|
|
|
|
+ <a-button key="back" @click="()=>{orderRejectVisiable=false}">取消</a-button>
|
|
|
|
+ <a-button type="primary" @click="rejectOrder" :loading="loadingElse">确定驳回</a-button>
|
|
|
|
+ </template>
|
|
|
|
+ <div style="position:relative">
|
|
|
|
+ <a-textarea
|
|
|
|
+ v-model="orderAdvice"
|
|
|
|
+ placeholder="请填写驳回理由"
|
|
|
|
+ :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
+ :maxLength='50'
|
|
|
|
+ />
|
|
|
|
+ <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{orderAdvice.length}}</span>/50</span>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+ </a-modal>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="section">
|
|
<div class="section">
|
|
@@ -496,12 +498,12 @@
|
|
</div>
|
|
</div>
|
|
<!-- 素材列表 -->
|
|
<!-- 素材列表 -->
|
|
<div class="section-item" v-if="currentOrderInfo.orderStatus==1||currentOrderInfo.orderStatus==3">
|
|
<div class="section-item" v-if="currentOrderInfo.orderStatus==1||currentOrderInfo.orderStatus==3">
|
|
- <!-- <div class="tabBox">
|
|
|
|
|
|
+ <div class="tabBox">
|
|
<a-tabs v-model="tabKey" @change="tabChange">
|
|
<a-tabs v-model="tabKey" @change="tabChange">
|
|
<a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
|
|
<a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
|
|
<a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
|
|
<a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
|
|
</a-tabs>
|
|
</a-tabs>
|
|
- </div> -->
|
|
|
|
|
|
+ </div>
|
|
|
|
|
|
|
|
|
|
<div class="section-box">
|
|
<div class="section-box">
|
|
@@ -697,34 +699,7 @@
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
></el-cascader>
|
|
></el-cascader>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
- <!-- <a-form-item
|
|
|
|
|
|
|
|
- label="其他"
|
|
|
|
- v-if="add"
|
|
|
|
- >
|
|
|
|
- <template v-for="(tag, index) in tags">
|
|
|
|
- <a-tooltip v-if="tag.length > 20" :key="tag" :title="tag">
|
|
|
|
- <a-tag :key="tag" :closable="index !== 0" :afterClose="() => handleClose(tag)">{{
|
|
|
|
- `${tag.slice(0, 20)}...`
|
|
|
|
- }}</a-tag>
|
|
|
|
- </a-tooltip>
|
|
|
|
- <a-tag v-else :key="tag" :closable="true" :afterClose="() => handleClose(tag)">{{ tag }}</a-tag>
|
|
|
|
- </template>
|
|
|
|
- <a-input
|
|
|
|
- v-if="inputVisible"
|
|
|
|
- ref="input"
|
|
|
|
- type="text"
|
|
|
|
- size="small"
|
|
|
|
- :style="{ width: '78px' }"
|
|
|
|
- :value="inputValue"
|
|
|
|
- @change="handleInputChange"
|
|
|
|
- @blur="handleInputConfirm"
|
|
|
|
- @keyup.enter="handleInputConfirm"
|
|
|
|
- />
|
|
|
|
- <a-tag v-else @click="showInput" style="background: #fff; borderstyle: dashed">
|
|
|
|
- <a-icon type="plus" />New Tag
|
|
|
|
- </a-tag>
|
|
|
|
- </a-form-item> -->
|
|
|
|
<a-form-item
|
|
<a-form-item
|
|
|
|
|
|
label="描述"
|
|
label="描述"
|
|
@@ -971,23 +946,32 @@
|
|
<a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
|
|
<a-button key="back" @click="()=>{videoRejectVisiable=false}">取消</a-button>
|
|
<a-button type="primary" @click="reject" :loading="loadingElse">确定驳回</a-button>
|
|
<a-button type="primary" @click="reject" :loading="loadingElse">确定驳回</a-button>
|
|
</template>
|
|
</template>
|
|
-
|
|
|
|
- <a-textarea
|
|
|
|
- v-model="videoAdvise"
|
|
|
|
- placeholder="请填写驳回理由"
|
|
|
|
- :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
- />
|
|
|
|
|
|
+ <div style="position:relative">
|
|
|
|
+ <a-textarea
|
|
|
|
+ v-model="videoAdvise"
|
|
|
|
+ placeholder="请填写驳回理由"
|
|
|
|
+ :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
+ :maxLength='50'
|
|
|
|
+ />
|
|
|
|
+ <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{videoAdvise.length}}</span>/50</span>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
</a-modal>
|
|
</a-modal>
|
|
<a-modal v-model="scriptRejectVisiable" title="脚本驳回" width='600px'>
|
|
<a-modal v-model="scriptRejectVisiable" title="脚本驳回" width='600px'>
|
|
<template slot="footer">
|
|
<template slot="footer">
|
|
<a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
|
|
<a-button key="back" @click="()=>{scriptRejectVisiable=false}">取消</a-button>
|
|
<a-button type="primary" @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
|
|
<a-button type="primary" @click="scriptReject" :loading="loadingElse">确定驳回</a-button>
|
|
</template>
|
|
</template>
|
|
- <a-textarea
|
|
|
|
- v-model="scriptAdvise"
|
|
|
|
- placeholder="请填写驳回理由"
|
|
|
|
- :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
- />
|
|
|
|
|
|
+ <div style="position:relative">
|
|
|
|
+ <a-textarea
|
|
|
|
+ v-model="scriptAdvise"
|
|
|
|
+ placeholder="请填写驳回理由"
|
|
|
|
+ :auto-size="{ minRows: 3, maxRows: 5 }"
|
|
|
|
+ :maxLength='50'
|
|
|
|
+ />
|
|
|
|
+ <span style="position:absolute;bottom:5px;right:10px;line-height:24px"><span style="color:#1890ff">{{scriptAdvise.length}}</span>/50</span>
|
|
|
|
+ </div>
|
|
|
|
+
|
|
</a-modal>
|
|
</a-modal>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -1131,6 +1115,7 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ orderRejectVisiable:false,
|
|
acceptLoading:false,
|
|
acceptLoading:false,
|
|
videoEchoInfo:{},
|
|
videoEchoInfo:{},
|
|
videoUploadLoading:false,
|
|
videoUploadLoading:false,
|
|
@@ -1488,6 +1473,7 @@ export default {
|
|
postAction(this.url.rejectOrder,params).then(res=>{
|
|
postAction(this.url.rejectOrder,params).then(res=>{
|
|
console.log(res)
|
|
console.log(res)
|
|
this.rejectOrderBtnLoading=false;
|
|
this.rejectOrderBtnLoading=false;
|
|
|
|
+ this.orderRejectVisiable=false;
|
|
if(res.success){
|
|
if(res.success){
|
|
this.$message.success(res.message)
|
|
this.$message.success(res.message)
|
|
this.orderDetailHttp()
|
|
this.orderDetailHttp()
|
|
@@ -1616,8 +1602,9 @@ export default {
|
|
console.log(res);
|
|
console.log(res);
|
|
this.data=[]
|
|
this.data=[]
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.data=res.result.list;
|
|
|
|
- this.ipagination.total=res.result.total
|
|
|
|
|
|
+ this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
|
|
|
|
+ // this.ipagination.total=res.result.total
|
|
|
|
+ this.ipagination.total=this.data.length
|
|
this.loading=false
|
|
this.loading=false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1627,8 +1614,9 @@ export default {
|
|
|
|
|
|
// tabqiehuan
|
|
// tabqiehuan
|
|
tabChange(key){
|
|
tabChange(key){
|
|
- console.log(key);
|
|
|
|
-
|
|
|
|
|
|
+ // console.log(key);
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ this.ipagination.current=1
|
|
},
|
|
},
|
|
|
|
|
|
// shipin通过审核
|
|
// shipin通过审核
|
|
@@ -1854,8 +1842,8 @@ export default {
|
|
|
|
|
|
beforeUpload(file) {
|
|
beforeUpload(file) {
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
// this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
- this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
- // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
|
|
+ // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
+ this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
|
|
this.loadDisabled = true
|
|
this.loadDisabled = true
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|