|
@@ -238,11 +238,11 @@
|
|
}
|
|
}
|
|
.videomarterialInfo{
|
|
.videomarterialInfo{
|
|
position: relative;
|
|
position: relative;
|
|
- height: 800px;
|
|
|
|
|
|
+ // height: 800px;
|
|
}
|
|
}
|
|
.marterialInfo{
|
|
.marterialInfo{
|
|
overflow: auto;
|
|
overflow: auto;
|
|
- height: 800px;
|
|
|
|
|
|
+ // height: 800px;
|
|
position: relative;
|
|
position: relative;
|
|
p{margin-bottom: 0;}
|
|
p{margin-bottom: 0;}
|
|
ul,li{
|
|
ul,li{
|
|
@@ -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
|
|
@@ -401,12 +388,27 @@
|
|
<p class="big">{{ currentOrderInfo.orderStatus | handlerOrderStatus}}</p>
|
|
<p class="big">{{ currentOrderInfo.orderStatus | handlerOrderStatus}}</p>
|
|
</div>
|
|
</div>
|
|
<div>
|
|
<div>
|
|
- <p class="markName">订单进度</p>
|
|
|
|
- <p class="big">{{(currentOrderInfo.materialFinishAmount/currentOrderInfo.materialAmount)*100|| 0 }}%</p>
|
|
|
|
|
|
+ <p class="markName">订单完成度</p>
|
|
|
|
+ <p class="big">{{Math.round((currentOrderInfo.materialFinishAmount/currentOrderInfo.materialAmount)*100)|| 0 }}%</p>
|
|
</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">
|
|
@@ -489,7 +491,7 @@
|
|
</div>
|
|
</div>
|
|
<div class="bottom">
|
|
<div class="bottom">
|
|
<h4>备注</h4>
|
|
<h4>备注</h4>
|
|
- <p>{{currentOrderInfo.orderRemark}}</p>
|
|
|
|
|
|
+ <p style="line-height:24px;text-indent:2em">{{currentOrderInfo.orderRemark}}</p>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@@ -586,7 +588,7 @@
|
|
:multiple="false"
|
|
:multiple="false"
|
|
/>
|
|
/>
|
|
<span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
|
|
<span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
|
|
- <span v-if="confirmLoading && videoinfo.url != ''" style="color: green">上传成功</span>
|
|
|
|
|
|
+ <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
<a-form-item
|
|
<a-form-item
|
|
label="封面上传"
|
|
label="封面上传"
|
|
@@ -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="描述"
|
|
@@ -733,7 +708,7 @@
|
|
<a-textarea
|
|
<a-textarea
|
|
placeholder="请输入描述"
|
|
placeholder="请输入描述"
|
|
v-decorator="[
|
|
v-decorator="[
|
|
- 'describe', // 给表单赋值或拉取表单时,该input对应的key
|
|
|
|
|
|
+ 'description', // 给表单赋值或拉取表单时,该input对应的key
|
|
]"
|
|
]"
|
|
:auto-size="{ minRows: 3, maxRows: 10 }"
|
|
:auto-size="{ minRows: 3, maxRows: 10 }"
|
|
/>
|
|
/>
|
|
@@ -815,13 +790,32 @@
|
|
<p>{{ currentVideo.videoAdvise }}</p>
|
|
<p>{{ currentVideo.videoAdvise }}</p>
|
|
</div>
|
|
</div>
|
|
<div class="bottom-btn">
|
|
<div class="bottom-btn">
|
|
- <a-button type='primary' @click="approved" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
|
|
|
|
|
|
+ <!-- <a-button type='primary' @click="approved" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
|
|
<a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">驳回</a-button>
|
|
<a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">驳回</a-button>
|
|
- <a-button type='primary' v-if="role!='operator'&¤tVideo.videoStatus==2" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>
|
|
|
|
- <a-button type='default' @click="onClose">关闭</a-button>
|
|
|
|
|
|
+ <a-button type='primary' v-if="role!='operator'&¤tVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>
|
|
|
|
+ <a-button type='default' @click="onClose">关闭</a-button> -->
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
+
|
|
</a-spin>
|
|
</a-spin>
|
|
|
|
+ <div
|
|
|
|
+ :style="{
|
|
|
|
+ position: 'absolute',
|
|
|
|
+ right: 0,
|
|
|
|
+ bottom: 0,
|
|
|
|
+ width: '100%',
|
|
|
|
+ borderTop: '1px solid #e9e9e9',
|
|
|
|
+ padding: '10px 16px',
|
|
|
|
+ background: '#fff',
|
|
|
|
+ textAlign: 'right',
|
|
|
|
+ zIndex: 1,
|
|
|
|
+ }"
|
|
|
|
+ >
|
|
|
|
+ <a-button type='primary' @click="approved" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">通过审核</a-button>
|
|
|
|
+ <a-button type='default' @click="()=>{videoRejectVisiable=true}" v-if="role=='operator'&¤tMaterial.materialStatus==5" style="margin-right:20px">驳回</a-button>
|
|
|
|
+ <a-button type='primary' v-if="role!='operator'&¤tVideo.videoStatus>=1" :disabled="currentVideo.clip!=userInfo.id" @click="modifyVideo" style="margin-right:20px">修改视频信息</a-button>
|
|
|
|
+ <a-button type='default' @click="onClose">关闭</a-button>
|
|
|
|
+ </div>
|
|
</a-drawer>
|
|
</a-drawer>
|
|
|
|
|
|
|
|
|
|
@@ -864,7 +858,7 @@
|
|
<div v-if="currentScript.scriptStatus>0" style="margin-right:20px">
|
|
<div v-if="currentScript.scriptStatus>0" style="margin-right:20px">
|
|
<a :href="currentScript.url">{{currentScript.scriptName}}</a>
|
|
<a :href="currentScript.url">{{currentScript.scriptName}}</a>
|
|
</div>
|
|
</div>
|
|
- <div v-if="currentScript.scriptStatus==0||currentScript.scriptStatus==2">
|
|
|
|
|
|
+ <div v-if="currentScript.scriptStatus<3">
|
|
|
|
|
|
<p v-if="currentMaterial.plan==userInfo.id">
|
|
<p v-if="currentMaterial.plan==userInfo.id">
|
|
<a-upload
|
|
<a-upload
|
|
@@ -904,16 +898,28 @@
|
|
</div>
|
|
</div>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
-
|
|
|
|
- <div class="scriptbottom-btn">
|
|
|
|
- <a-button type='primary' @click="scriptApproved" style="margin-right:20px" v-if="role=='operator'&¤tMaterial.materialStatus==2">通过审核</a-button>
|
|
|
|
|
|
+ </div>
|
|
|
|
+
|
|
|
|
+ </a-spin>
|
|
|
|
+ <div
|
|
|
|
+ :style="{
|
|
|
|
+ position: 'absolute',
|
|
|
|
+ right: 0,
|
|
|
|
+ bottom: 0,
|
|
|
|
+ width: '100%',
|
|
|
|
+ borderTop: '1px solid #e9e9e9',
|
|
|
|
+ padding: '10px 16px',
|
|
|
|
+ background: '#fff',
|
|
|
|
+ textAlign: 'right',
|
|
|
|
+ zIndex: 1,
|
|
|
|
+ }"
|
|
|
|
+ >
|
|
|
|
+ <a-button type='primary' @click="scriptApproved" style="margin-right:20px" :loading='acceptLoading' v-if="role=='operator'&¤tMaterial.materialStatus==2">通过审核</a-button>
|
|
|
|
|
|
<a-button type='default' v-if="role=='operator'&¤tMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}" style="margin-right:20px">驳回</a-button>
|
|
<a-button type='default' v-if="role=='operator'&¤tMaterial.materialStatus==2" @click="()=>{scriptRejectVisiable=true}" style="margin-right:20px">驳回</a-button>
|
|
<!-- <a-button type='primary' @click="dowmLoadScript" style="margin-right:20px">下载脚本</a-button> -->
|
|
<!-- <a-button type='primary' @click="dowmLoadScript" style="margin-right:20px">下载脚本</a-button> -->
|
|
<a-button type='default' @click="scriptClose">关闭</a-button>
|
|
<a-button type='default' @click="scriptClose">关闭</a-button>
|
|
- </div>
|
|
|
|
- </div>
|
|
|
|
- </a-spin>
|
|
|
|
|
|
+ </div>
|
|
</a-drawer>
|
|
</a-drawer>
|
|
|
|
|
|
</div>
|
|
</div>
|
|
@@ -939,13 +945,14 @@
|
|
<a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
|
|
<a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
- <a-form-model-item label="拍摄" ref="shot" prop="shot">
|
|
|
|
- <a-select
|
|
|
|
-
|
|
|
|
|
|
+ <!-- {{currentMaterial.materialType==1?true:false}} -->
|
|
|
|
+ <a-form-model-item label="拍摄" ref="shot" prop="shot" :rules='[{ required: currentMaterial.materialType==1, message: "拍摄人员必须指派" ,trigger: "change" }]'>
|
|
|
|
+ <a-select
|
|
v-model="formPerson.shot"
|
|
v-model="formPerson.shot"
|
|
showSearch
|
|
showSearch
|
|
optionFilterProp="children"
|
|
optionFilterProp="children"
|
|
:filterOption="filterOption"
|
|
:filterOption="filterOption"
|
|
|
|
+
|
|
>
|
|
>
|
|
<a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
|
|
<a-select-option :value="item.userId" v-for="item of ascription" :key="item.userId">{{item.userName}}</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
@@ -970,23 +977,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>
|
|
@@ -1130,15 +1146,17 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ orderRejectVisiable:false,
|
|
|
|
+ acceptLoading:false,
|
|
videoEchoInfo:{},
|
|
videoEchoInfo:{},
|
|
videoUploadLoading:false,
|
|
videoUploadLoading:false,
|
|
videoRejectType:'1',
|
|
videoRejectType:'1',
|
|
assignVisibleLoading:false,
|
|
assignVisibleLoading:false,
|
|
visibleLoading:false,
|
|
visibleLoading:false,
|
|
- rules: {
|
|
|
|
|
|
+ rules: {
|
|
|
|
|
|
clip: [{ required: true, message: '剪辑人员必须指派', trigger: 'change' }],
|
|
clip: [{ required: true, message: '剪辑人员必须指派', trigger: 'change' }],
|
|
- // shot: [{ required: true, message: '拍摄人员必须指派', trigger: 'change' }],
|
|
|
|
|
|
+ // shot: [],
|
|
plan: [{ required: true, message: '编导人员必须指派', trigger: 'change' }],
|
|
plan: [{ required: true, message: '编导人员必须指派', trigger: 'change' }],
|
|
|
|
|
|
},
|
|
},
|
|
@@ -1486,6 +1504,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()
|
|
@@ -1615,7 +1634,9 @@ export default {
|
|
this.data=[]
|
|
this.data=[]
|
|
if(res.success){
|
|
if(res.success){
|
|
this.data=res.result.list;
|
|
this.data=res.result.list;
|
|
|
|
+ // this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
|
|
this.ipagination.total=res.result.total
|
|
this.ipagination.total=res.result.total
|
|
|
|
+ // this.ipagination.total=this.data.length
|
|
this.loading=false
|
|
this.loading=false
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1625,73 +1646,111 @@ export default {
|
|
|
|
|
|
// tabqiehuan
|
|
// tabqiehuan
|
|
tabChange(key){
|
|
tabChange(key){
|
|
- console.log(key);
|
|
|
|
-
|
|
|
|
|
|
+ // console.log(key);
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ this.ipagination.current=1
|
|
},
|
|
},
|
|
|
|
|
|
// shipin通过审核
|
|
// shipin通过审核
|
|
approved(){
|
|
approved(){
|
|
- postAction(this.url.videoAccept,{
|
|
|
|
- id:this.currentMaterial.id,
|
|
|
|
- orderCode:this.currentMaterial.orderCode,
|
|
|
|
|
|
+ this.acceptLoading=true;
|
|
|
|
+ getAction('/platform/material/verifyVideo',{
|
|
materialCode:this.currentMaterial.materialCode,
|
|
materialCode:this.currentMaterial.materialCode,
|
|
- videoId:this.currentVideo.videoId
|
|
|
|
|
|
+ videoId:this.currentMaterial.videoId,
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
- console.log(res);
|
|
|
|
-
|
|
|
|
- this.visible=false;
|
|
|
|
- this.videoAdvise=''
|
|
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.$message.success(res.message);
|
|
|
|
- // this.tableHttp(this.$parent.materialStatus)
|
|
|
|
- this.materialHttp()
|
|
|
|
|
|
+ postAction(this.url.videoAccept,{
|
|
|
|
+ id:this.currentMaterial.id,
|
|
|
|
+ orderCode:this.currentMaterial.orderCode,
|
|
|
|
+ materialCode:this.currentMaterial.materialCode,
|
|
|
|
+ videoId:this.currentVideo.videoId
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ console.log(res);
|
|
|
|
+ this.acceptLoading=false
|
|
|
|
+ this.visible=false;
|
|
|
|
+ this.videoAdvise=''
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.$message.success(res.message);
|
|
|
|
+
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}else{
|
|
}else{
|
|
this.$message.error(res.message)
|
|
this.$message.error(res.message)
|
|
|
|
+ this.acceptLoading=false
|
|
|
|
+ this.materialHttp()
|
|
}
|
|
}
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 视频驳回
|
|
// 视频驳回
|
|
reject(){
|
|
reject(){
|
|
this.loadingElse=true;
|
|
this.loadingElse=true;
|
|
- if(this.videoAdvise){
|
|
|
|
- postAction(this.url.videoReject,{
|
|
|
|
- id:this.currentMaterial.id,
|
|
|
|
- videoAdvise:this.videoAdvise,
|
|
|
|
- materialCode:this.currentMaterial.materialCode
|
|
|
|
-
|
|
|
|
- }).then(res=>{
|
|
|
|
- console.log(res);
|
|
|
|
- this.videoAdvise=''
|
|
|
|
- this.visible=false;
|
|
|
|
- this.videoRejectVisiable=false;
|
|
|
|
- if(res.success){
|
|
|
|
- this.$message.success(res.message);
|
|
|
|
- this.materialHttp()
|
|
|
|
|
|
+ getAction('/platform/material/verifyVideo',{
|
|
|
|
+ materialCode:this.currentMaterial.materialCode,
|
|
|
|
+ videoId:this.currentMaterial.videoId,
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ if(res.success){
|
|
|
|
+ if(this.videoAdvise){
|
|
|
|
+ postAction(this.url.videoReject,{
|
|
|
|
+ id:this.currentMaterial.id,
|
|
|
|
+ videoAdvise:this.videoAdvise,
|
|
|
|
+ materialCode:this.currentMaterial.materialCode
|
|
|
|
+
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ console.log(res);
|
|
|
|
+ this.loadingElse=false
|
|
|
|
+ this.videoAdvise=''
|
|
|
|
+ this.visible=false;
|
|
|
|
+ this.videoRejectVisiable=false;
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.$message.success(res.message);
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}else{
|
|
}else{
|
|
- this.$message.error(res.message)
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- }else{
|
|
|
|
- this.loadingElse=false;
|
|
|
|
- this.$message.error('请填写驳回理由')
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ this.loadingElse=false;
|
|
|
|
+ this.$message.error('请填写驳回理由')
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ this.loadingElse=false
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
|
|
},
|
|
},
|
|
// 脚本通过审核
|
|
// 脚本通过审核
|
|
scriptApproved(){
|
|
scriptApproved(){
|
|
- postAction(this.url.scriptAccept,{
|
|
|
|
- id:this.currentMaterial.id,
|
|
|
|
- orderCode:this.currentMaterial.orderCode,
|
|
|
|
- materialCode:this.currentMaterial.materialCode
|
|
|
|
|
|
+ // console.log(this.currentMaterial)
|
|
|
|
+ this.acceptLoading=true;
|
|
|
|
+ getAction('/platform/material/verifyScript',{
|
|
|
|
+ materialCode:this.currentMaterial.materialCode,
|
|
|
|
+ scriptId:this.currentMaterial.scriptId,
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
- console.log(res);
|
|
|
|
-
|
|
|
|
- this.scriptVisible=false;
|
|
|
|
if(res.success){
|
|
if(res.success){
|
|
- this.$message.success(res.message);
|
|
|
|
- this.materialHttp()
|
|
|
|
|
|
+ postAction(this.url.scriptAccept,{
|
|
|
|
+ id:this.currentMaterial.id,
|
|
|
|
+ orderCode:this.currentMaterial.orderCode,
|
|
|
|
+ materialCode:this.currentMaterial.materialCode
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ console.log(res);
|
|
|
|
+ this.acceptLoading=false
|
|
|
|
+ this.scriptVisible=false;
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.$message.success(res.message);
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}else{
|
|
}else{
|
|
|
|
+ this.acceptLoading=false;
|
|
|
|
+ this.scriptVisible=false;
|
|
|
|
+ this.materialHttp()
|
|
this.$message.error(res.message)
|
|
this.$message.error(res.message)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -1699,30 +1758,41 @@ export default {
|
|
// 脚本驳回
|
|
// 脚本驳回
|
|
scriptReject(){
|
|
scriptReject(){
|
|
this.loadingElse=true;
|
|
this.loadingElse=true;
|
|
- if(this.scriptAdvise){
|
|
|
|
- postAction(this.url.scriptReject,{
|
|
|
|
- id:this.currentMaterial.id,
|
|
|
|
- scriptAdvise:this.scriptAdvise,
|
|
|
|
- materialCode:this.currentMaterial.materialCode
|
|
|
|
- }).then(res=>{
|
|
|
|
- console.log(res);
|
|
|
|
|
|
+ getAction('/platform/material/verifyScript',{
|
|
|
|
+ materialCode:this.currentMaterial.materialCode,
|
|
|
|
+ scriptId:this.currentMaterial.scriptId,
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ if(res.success){
|
|
|
|
+ if(this.scriptAdvise){
|
|
|
|
+ postAction(this.url.scriptReject,{
|
|
|
|
+ id:this.currentMaterial.id,
|
|
|
|
+ scriptAdvise:this.scriptAdvise,
|
|
|
|
+ materialCode:this.currentMaterial.materialCode
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ console.log(res);
|
|
|
|
|
|
- this.scriptVisible=false;
|
|
|
|
- this.scriptAdvise=''
|
|
|
|
- this.scriptRejectVisiable=false;
|
|
|
|
- this.loadingElse=false;
|
|
|
|
- if(res.success){
|
|
|
|
- this.$message.success(res.message);
|
|
|
|
- this.materialHttp()
|
|
|
|
|
|
+ this.scriptVisible=false;
|
|
|
|
+ this.scriptAdvise=''
|
|
|
|
+ this.scriptRejectVisiable=false;
|
|
|
|
+ this.loadingElse=false;
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.$message.success(res.message);
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ }else{
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
}else{
|
|
}else{
|
|
- this.$message.error(res.message)
|
|
|
|
|
|
+ this.loadingElse=false;
|
|
|
|
+ this.$message.error('请填写驳回理由')
|
|
}
|
|
}
|
|
- })
|
|
|
|
- }else{
|
|
|
|
- this.loadingElse=false;
|
|
|
|
- this.$messgae.error('请填写驳回理由')
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
|
|
+ }else{
|
|
|
|
+ this.loadingElse=false;
|
|
|
|
+ this.scriptVisible=false;
|
|
|
|
+ this.materialHttp()
|
|
|
|
+ this.$message.error(res.message)
|
|
|
|
+ }
|
|
|
|
+ })
|
|
},
|
|
},
|
|
// 生成水印
|
|
// 生成水印
|
|
getWater() {
|
|
getWater() {
|
|
@@ -1748,30 +1818,29 @@ export default {
|
|
// 请求order详情数据
|
|
// 请求order详情数据
|
|
orderDetailHttp(){
|
|
orderDetailHttp(){
|
|
this.pageSpinning=true;
|
|
this.pageSpinning=true;
|
|
|
|
+ this.currentOrderInfo={}
|
|
getAction(this.url.orderDetail,{
|
|
getAction(this.url.orderDetail,{
|
|
id:this.currentOrderId
|
|
id:this.currentOrderId
|
|
}).then(res=>{
|
|
}).then(res=>{
|
|
console.log(res)
|
|
console.log(res)
|
|
this.pageSpinning=false;
|
|
this.pageSpinning=false;
|
|
- this.currentOrderInfo={}
|
|
|
|
if(res.success){
|
|
if(res.success){
|
|
this.currentOrderInfo=res.result;
|
|
this.currentOrderInfo=res.result;
|
|
- if(res.result.orderStatus){
|
|
|
|
- switch(res.result.orderStatus){
|
|
|
|
- case 0:
|
|
|
|
- this.currentStep=1;
|
|
|
|
- break
|
|
|
|
- case 1:
|
|
|
|
- this.currentStep=2;
|
|
|
|
- break
|
|
|
|
- case 2:
|
|
|
|
- this.currentStep=0;
|
|
|
|
- break
|
|
|
|
- case 3:
|
|
|
|
- this.currentStep=3;
|
|
|
|
- break
|
|
|
|
|
|
+ // res.result.orderStatus
|
|
|
|
+ console.log(this.currentOrderInfo.orderStatus)
|
|
|
|
+ if(this.currentOrderInfo.orderStatus || this.currentOrderInfo.orderStatus==0){
|
|
|
|
+ if(this.currentOrderInfo.orderStatus==0){
|
|
|
|
+ this.currentStep=1;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==1){
|
|
|
|
+ this.currentStep=2;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==2){
|
|
|
|
+ this.currentStep=0;
|
|
|
|
+ }else if(this.currentOrderInfo.orderStatus==3){
|
|
|
|
+ this.currentStep=3;
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
+ console.log(this.currentStep)
|
|
|
|
|
|
this.materialHttp()
|
|
this.materialHttp()
|
|
}
|
|
}
|
|
@@ -1803,8 +1872,9 @@ 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://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
|
|
|
|
|
|
+ this.uploadAction= `http://jiaoyangapi.shyouteng.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.loadDisabled = true
|
|
this.loadDisabled = true
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
|
|
@@ -2026,6 +2096,10 @@ export default {
|
|
|
|
|
|
// 上传视频相关方法
|
|
// 上传视频相关方法
|
|
removeUpload() {
|
|
removeUpload() {
|
|
|
|
+ this.urlList.url='';
|
|
|
|
+ this.urlList.md5='';
|
|
|
|
+ this.urlList.name='';
|
|
|
|
+
|
|
this.form.setFieldsValue({
|
|
this.form.setFieldsValue({
|
|
contentTagList: null,
|
|
contentTagList: null,
|
|
modalityTagList: null,
|
|
modalityTagList: null,
|
|
@@ -2323,10 +2397,7 @@ export default {
|
|
// });
|
|
// });
|
|
|
|
|
|
this.getTagListAll()
|
|
this.getTagListAll()
|
|
-
|
|
|
|
- },
|
|
|
|
- mounted() {
|
|
|
|
- let userInfo=localStorage.getItem('pro__Login_Userinfo');
|
|
|
|
|
|
+ let userInfo=localStorage.getItem('pro__Login_Userinfo');
|
|
if(userInfo){
|
|
if(userInfo){
|
|
this.userInfo=JSON.parse(userInfo).value
|
|
this.userInfo=JSON.parse(userInfo).value
|
|
}
|
|
}
|
|
@@ -2337,6 +2408,13 @@ export default {
|
|
if(this.currentOrderId){
|
|
if(this.currentOrderId){
|
|
this.orderDetailHttp()
|
|
this.orderDetailHttp()
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ mounted() {
|
|
|
|
+
|
|
|
|
+ },
|
|
|
|
+ destroyed() {
|
|
|
|
+ this.currentOrderInfo={}
|
|
},
|
|
},
|
|
activated() {
|
|
activated() {
|
|
this.currentOrderId=this.$parent.orderId;
|
|
this.currentOrderId=this.$parent.orderId;
|