|
|
@@ -5,29 +5,17 @@
|
|
|
<div class="info-line">
|
|
|
<el-form-item prop="need_name">
|
|
|
<span>申请标题</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.need_name"
|
|
|
- placeholder="申请标题"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!saveStatus" v-model="infoApply.need_name" placeholder="申请标题"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="applydept">
|
|
|
<span>申请流程</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.applydept"
|
|
|
- placeholder="广告申请"
|
|
|
- ></el-input>
|
|
|
+ <el-input disabled v-model="applydept" placeholder="广告申请"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="info-line">
|
|
|
<el-form-item prop="applydept">
|
|
|
<span>申请部门</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.applydept"
|
|
|
- placeholder="申请部门"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!saveStatus" v-model="infoApply.applydept" placeholder="申请部门"></el-input>
|
|
|
<!-- <el-select disabled clearable v-model="infoApply.dept" placeholder="申请部门">
|
|
|
<el-option v-for="items in terminalopt" :key="items.id" :label="items.ou" :value="items.id">
|
|
|
</el-option>
|
|
|
@@ -35,51 +23,30 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="proposer">
|
|
|
<span>申请人</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.proposer"
|
|
|
- placeholder="申请人"
|
|
|
- ></el-input>
|
|
|
+ <el-input disabled v-model="infoApply.proposer" placeholder="申请人"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="info-line">
|
|
|
<el-form-item>
|
|
|
<span>申请时间</span>
|
|
|
- <el-date-picker
|
|
|
- disabled
|
|
|
- v-model="infoApply.time"
|
|
|
- type="date"
|
|
|
- placeholder="申请时间"
|
|
|
- >
|
|
|
+ <el-date-picker disabled v-model="infoApply.time" type="date" placeholder="申请时间">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="tel">
|
|
|
<span>联系电话</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.tel"
|
|
|
- placeholder="联系电话"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!saveStatus" v-model="infoApply.tel" placeholder="联系电话"></el-input>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
<div class="info-line">
|
|
|
<el-form-item prop="filenum">
|
|
|
<span>文件编号</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.filenum"
|
|
|
- placeholder="文件编号"
|
|
|
- >
|
|
|
+ <el-input disabled v-model="infoApply.filenum" placeholder="文件编号">
|
|
|
</el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>完成时间</span>
|
|
|
- <el-date-picker
|
|
|
- disabled
|
|
|
- v-model="infoApply.donetime"
|
|
|
- type="date"
|
|
|
- placeholder="完成时间"
|
|
|
- >
|
|
|
+ <el-date-picker :disabled="!saveStatus" v-model="infoApply.donetime" type="date" placeholder="完成时间"
|
|
|
+ :pickerOptions="pickerOptions">
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
</div>
|
|
|
@@ -87,35 +54,16 @@
|
|
|
<div class="info-line">
|
|
|
<el-form-item>
|
|
|
<span>紧急程度</span>
|
|
|
- <el-select
|
|
|
- disabled
|
|
|
- clearable
|
|
|
- v-model="infoApply.importance"
|
|
|
- placeholder="紧急程度"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="items in fireopt"
|
|
|
- :key="items.dataCode"
|
|
|
- :label="items.dataName"
|
|
|
- :value="items.dataCode"
|
|
|
- >
|
|
|
+ <el-select :disabled="!saveStatus" clearable v-model="infoApply.importance" placeholder="紧急程度">
|
|
|
+ <el-option v-for="items in fireopt" :key="items.dataCode" :label="items.dataName" :value="items.dataCode">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
<span>素材类型</span>
|
|
|
- <el-select
|
|
|
- disabled
|
|
|
- clearable
|
|
|
- v-model="infoApply.sourcetype"
|
|
|
- placeholder="素材类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="items in materTypeopt"
|
|
|
- :key="items.dataCode"
|
|
|
- :label="items.dataName"
|
|
|
- :value="items.dataCode"
|
|
|
- >
|
|
|
+ <el-select :disabled="!saveStatus" clearable v-model="infoApply.sourcetype" placeholder="素材类型">
|
|
|
+ <el-option v-for="items in materTypeopt" :key="items.dataCode" :label="items.dataName"
|
|
|
+ :value="items.dataCode">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -136,40 +84,19 @@
|
|
|
|
|
|
<el-form-item class="info-line online">
|
|
|
<span>宣传内容</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.sellingpoint"
|
|
|
- placeholder="广告宣传内容"
|
|
|
- type="textarea"
|
|
|
- :rows="3"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!saveStatus" v-model="infoApply.sellingpoint" placeholder="广告宣传内容" type="textarea"
|
|
|
+ :rows="3"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item class="info-line online">
|
|
|
<span>其他说明</span>
|
|
|
- <el-input
|
|
|
- disabled
|
|
|
- v-model="infoApply.procontent"
|
|
|
- placeholder="设计稿内容描述"
|
|
|
- type="textarea"
|
|
|
- :rows="3"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!saveStatus" v-model="infoApply.procontent" placeholder="设计稿内容描述" type="textarea"
|
|
|
+ :rows="3"></el-input>
|
|
|
</el-form-item>
|
|
|
<div style="padding: 0 20px 0 100px; margin-bottom: 20px">
|
|
|
- <uploadDown
|
|
|
- ref="myupload"
|
|
|
- :datalist="datalist"
|
|
|
- :dialogStatus="uploadstatus"
|
|
|
- ></uploadDown>
|
|
|
+ <uploadDown ref="myupload" :datalist="datalist" :dialogStatus="uploadstatus"></uploadDown>
|
|
|
</div>
|
|
|
- <div
|
|
|
- style="padding: 0 20px 0 100px; margin-bottom: 20px"
|
|
|
- v-if="uploadsts"
|
|
|
- >
|
|
|
- <myUpload
|
|
|
- @uploadBack="uploadBack"
|
|
|
- :fileInfo="fileInfo"
|
|
|
- :fileList="fileInfo.fileList"
|
|
|
- >
|
|
|
+ <div style="padding: 0 20px 0 100px; margin-bottom: 20px" v-if="uploadsts">
|
|
|
+ <myUpload @uploadBack="uploadBack" :fileInfo="fileInfo" :fileList="fileInfo.fileList">
|
|
|
</myUpload>
|
|
|
</div>
|
|
|
<!-- <el-form-item class="info-line online" v-if="changeinfo">
|
|
|
@@ -185,52 +112,26 @@
|
|
|
<div v-if="suppSts" class="supp-box">
|
|
|
<span style="padding-left: 20px; padding-top: 8px">简易设计</span>
|
|
|
<div v-for="item in gys" class="suppdiv">
|
|
|
- <el-checkbox
|
|
|
- :disabled="!changeinfo || !suppdis"
|
|
|
- v-model="item.sts"
|
|
|
- @change="cancel(item)"
|
|
|
- ><span>{{ item.type }}</span></el-checkbox
|
|
|
- >
|
|
|
+ <el-checkbox :disabled="!changeinfo || !suppdis" v-model="item.sts" @change="cancel(item)"><span>{{ item.type
|
|
|
+ }}</span></el-checkbox>
|
|
|
<div class="box">
|
|
|
<div v-for="one in item.list" class="supp-list">
|
|
|
- <el-select
|
|
|
- :disabled="!changeinfo || !suppdis"
|
|
|
- v-model="one.cho"
|
|
|
- placeholder="请选择供应商"
|
|
|
- @change="priceone(one, item)"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="items in item.supplier"
|
|
|
- :key="items.name"
|
|
|
- :label="items.name"
|
|
|
- :value="items.name"
|
|
|
- >
|
|
|
+ <el-select :disabled="!changeinfo || !suppdis" v-model="one.cho" placeholder="请选择供应商"
|
|
|
+ @change="priceone(one, item)">
|
|
|
+ <el-option v-for="items in item.supplier" :key="items.name" :label="items.name" :value="items.name">
|
|
|
</el-option>
|
|
|
</el-select>
|
|
|
- <el-input
|
|
|
- :disabled="!changeinfo || !suppdis"
|
|
|
- v-model="one.num"
|
|
|
- placeholder="数量"
|
|
|
- @input="numChange(one)"
|
|
|
- ></el-input>
|
|
|
+ <el-input :disabled="!changeinfo || !suppdis" v-model="one.num" placeholder="数量" @input="numChange(one)">
|
|
|
+ </el-input>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-button @click="item.list.push({})" type="text" v-if="suppdis"
|
|
|
- >继续添加</el-button
|
|
|
- >
|
|
|
+ <el-button @click="item.list.push({})" type="text" v-if="suppdis">继续添加</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
|
|
|
<div style="margin-bottom: 20px; padding: 0 20px">
|
|
|
- <el-table
|
|
|
- class="com-table"
|
|
|
- ref="multipleTable"
|
|
|
- :data="rovaList"
|
|
|
- tooltip-effect="dark"
|
|
|
- size="small"
|
|
|
- border
|
|
|
- style="width: 100%"
|
|
|
- >
|
|
|
+ <el-table class="com-table" ref="multipleTable" :data="rovaList" tooltip-effect="dark" size="small" border
|
|
|
+ style="width: 100%">
|
|
|
<el-table-column prop="taskId" label="编号"> </el-table-column>
|
|
|
<el-table-column prop="taskName" label="环节"> </el-table-column>
|
|
|
<el-table-column prop="assignee" label="处理人"> </el-table-column>
|
|
|
@@ -240,27 +141,13 @@
|
|
|
</el-table>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog
|
|
|
- title="选择审批人"
|
|
|
- v-if="checkexa"
|
|
|
- :before-close="handleClose"
|
|
|
- :visible.sync="checkexa"
|
|
|
- :modal="false"
|
|
|
- width="100%"
|
|
|
- :destroy-on-close="true"
|
|
|
- :modal-append-to-body="false"
|
|
|
- :close-on-click-modal="false"
|
|
|
- >
|
|
|
- <Workflow
|
|
|
- :list="infoApply"
|
|
|
- :requestForm="requestForm"
|
|
|
- @updateForm="updateForm"
|
|
|
- />
|
|
|
+ <el-dialog title="选择审批人" v-if="checkexa" :before-close="handleClose" :visible.sync="checkexa" :modal="false"
|
|
|
+ width="100%" :destroy-on-close="true" :modal-append-to-body="false" :close-on-click-modal="false">
|
|
|
+ <Workflow :list="infoApply" :requestForm="requestForm" @updateForm="updateForm" />
|
|
|
</el-dialog>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button v-if="changeinfo" type="primary" @click="dialogCli(2)"
|
|
|
- >处 理</el-button
|
|
|
- >
|
|
|
+ <el-button v-if="changeinfo" type="primary" @click="dialogCli(2)">处 理</el-button>
|
|
|
+ <el-button v-if="saveStatus" type="primary" @click="dialogCli(4)">保 存</el-button>
|
|
|
<!-- <el-button v-if="changeinfo" type="primary" @click="dialogCli(1)"
|
|
|
>驳 回</el-button
|
|
|
> -->
|
|
|
@@ -275,7 +162,7 @@ import Workflow from "../../../../components/workflowBase";
|
|
|
import uploadDown from "../../../../components/uploadDown.vue";
|
|
|
import myUpload from "../../../../components/upload.vue";
|
|
|
export default {
|
|
|
- props: ["componentInfo", "componentStatus", "changeinfo"],
|
|
|
+ props: ["componentInfo", "componentStatus", "changeinfo", "saveStatus"],
|
|
|
components: {
|
|
|
uploadDown,
|
|
|
myUpload,
|
|
|
@@ -283,9 +170,10 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ applydept: '广告申请',
|
|
|
requestForm: {
|
|
|
- fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
|
|
|
- // fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
|
|
|
+ // fresourceId: "99e7da22-5f04-11ed-b399-e00084564cce", //线上环境
|
|
|
+ fresourceId: "e817fc35-5a51-11ed-8912-00505687dcd3", //测试环境
|
|
|
// fresourceId: "3c9baf21-3e43-11ed-ad6b-d6cd97160e00", //本地环境
|
|
|
processDefinitionKey: "ggsj_process",
|
|
|
},
|
|
|
@@ -345,7 +233,7 @@ export default {
|
|
|
suppdis: false,
|
|
|
uploadsts: false,
|
|
|
attList: [],
|
|
|
- mkFileShareAttachList:[],
|
|
|
+ mkFileShareAttachList: [],
|
|
|
gys: [
|
|
|
// {
|
|
|
// type:'设计类型1',
|
|
|
@@ -424,7 +312,7 @@ export default {
|
|
|
|
|
|
let res = await this.common.httpPost(obj, success);
|
|
|
function success(data) {
|
|
|
- data.data.map((item) => {
|
|
|
+ data.data.map((item) => {
|
|
|
item.startTime = _this.$util.datetimeFormat(item.startTime);
|
|
|
item.endTime = _this.$util.datetimeFormat(item.endTime);
|
|
|
});
|
|
|
@@ -452,7 +340,7 @@ export default {
|
|
|
// }else{
|
|
|
// this.suppSts = false;
|
|
|
// }
|
|
|
-
|
|
|
+
|
|
|
this.getinfolist();
|
|
|
//判断当前节点
|
|
|
if (this.infoApply.taskName == "宣传负责人审批") {
|
|
|
@@ -515,8 +403,22 @@ export default {
|
|
|
},
|
|
|
//添加
|
|
|
dialogCli(v) {
|
|
|
- this.checkexa = true;
|
|
|
+ if(v ==2 ){
|
|
|
+ this.checkexa = true;
|
|
|
+ }
|
|
|
//取消操作
|
|
|
+ if (v == 4) {
|
|
|
+ this.$http({
|
|
|
+ url: "/market/ggsj/update",
|
|
|
+ method: "post",
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json",
|
|
|
+ },
|
|
|
+ data: this.infoApply,
|
|
|
+ }).then((res) => {
|
|
|
+ this.$message.success('保存成功')
|
|
|
+ });
|
|
|
+ }
|
|
|
if (v === 3) {
|
|
|
console.log(this.gys);
|
|
|
this.$emit("closeEdio");
|
|
|
@@ -539,7 +441,7 @@ export default {
|
|
|
this.infoApply.gys = gys;
|
|
|
this.infoApply.price = price;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
let list = {
|
|
|
id: this.infoApply.id,
|
|
|
terminalRes: this.infoApply.gys,
|
|
|
@@ -553,7 +455,7 @@ export default {
|
|
|
},
|
|
|
data: list,
|
|
|
}).then((res) => {
|
|
|
- console.log(res);
|
|
|
+ this.$message.success('保存成功')
|
|
|
});
|
|
|
//调用接口
|
|
|
// this.suppSts = true;
|
|
|
@@ -566,9 +468,9 @@ export default {
|
|
|
mkFileShareAttachList: [],
|
|
|
};
|
|
|
list.mkFileShareAttachList = this.attList;
|
|
|
- if(this.mkFileShareAttachList){
|
|
|
- this.mkFileShareAttachList.map((item) =>{
|
|
|
- list.mkFileShareAttachList.push(item)
|
|
|
+ if (this.mkFileShareAttachList) {
|
|
|
+ this.mkFileShareAttachList.map((item) => {
|
|
|
+ list.mkFileShareAttachList.push(item)
|
|
|
})
|
|
|
}
|
|
|
this.$http({
|
|
|
@@ -783,8 +685,8 @@ export default {
|
|
|
data: { id: e.id },
|
|
|
}).then((res) => {
|
|
|
console.log(res);
|
|
|
- this.mkFileShareAttachList = res.data.mkFileShareAttachList;
|
|
|
- if(res.data.paramVal){
|
|
|
+ this.mkFileShareAttachList = res.data.mkFileShareAttachList;
|
|
|
+ if (res.data.paramVal) {
|
|
|
|
|
|
}
|
|
|
console.log(
|
|
|
@@ -793,11 +695,25 @@ export default {
|
|
|
// this.datalist.attList = res.data.mkFileShareAttachList;
|
|
|
});
|
|
|
},
|
|
|
- handleClose(){
|
|
|
+ handleClose() {
|
|
|
console.log(123);
|
|
|
this.checkexa = false;
|
|
|
}
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ pickerOptions: function () {
|
|
|
+ return {
|
|
|
+ disabledDate(time) {
|
|
|
+ // if(time.getTime() < Date.now() - 8.64e7 || (time.getTime() > Date.now() && time.getTime() < Date.now() + 8.64e7*3) ){
|
|
|
+ // return true
|
|
|
+ // }
|
|
|
+ if (time.getTime() < Date.now() + 8.64e7 * 3) {
|
|
|
+ return true;
|
|
|
+ }
|
|
|
+ },
|
|
|
+ };
|
|
|
+ },
|
|
|
+ },
|
|
|
mounted() {
|
|
|
this.getQueryList(this.componentInfo); //获取表单上传列表，爆炸贴
|
|
|
this.clickForm(this.componentInfo);
|
|
|
@@ -881,30 +797,37 @@ export default {
|
|
|
text-align: right;
|
|
|
padding: 15px 20px;
|
|
|
}
|
|
|
+
|
|
|
.supp-box {
|
|
|
span {
|
|
|
width: 100px;
|
|
|
display: inline-block;
|
|
|
}
|
|
|
+
|
|
|
.suppdiv {
|
|
|
width: calc(100% - 110px);
|
|
|
float: right;
|
|
|
+
|
|
|
.el-checkbox {
|
|
|
vertical-align: top;
|
|
|
padding-top: 10px;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
.box {
|
|
|
width: calc(100% - 200px);
|
|
|
display: inline-block;
|
|
|
// float: right;
|
|
|
}
|
|
|
+
|
|
|
.supp-list {
|
|
|
margin-bottom: 20px;
|
|
|
+
|
|
|
.el-select {
|
|
|
width: 45%;
|
|
|
margin-right: 5%;
|
|
|
}
|
|
|
+
|
|
|
.el-input {
|
|
|
width: 45%;
|
|
|
margin-right: 5%;
|
yangbifan