diff --git a/src/api/process.js b/src/api/process.js index c1dbff26f..79874460a 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -170,7 +170,16 @@ export function taskDel (data) { params: data }) } -//模板下载 +//清单模板下载 +export function templateDownload(data) { + return axios({ + url: '/api/sarLawsDetailedList/sar-laws-detailed-list/exportEmpty', + method: 'get', + responseType: 'blob', + params: data + }) +} +//企标立项模板下载 export function downloadStatus(data) { return axios({ url: '/api/importWkExcel/exportqbzxdjh', diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 6db629d24..45b47146d 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -11,7 +11,7 @@
  • {{ getPrcNameFilter(item) }} + style="line-height: 30px; font-size: 13px;display: inline-block;width: 100%;">{{ getPrcNameFilter(item) }} diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 90abff80d..a37d7729b 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -109,7 +109,7 @@
    正在获取中…… - + @@ -1528,6 +1528,8 @@ export default { confirmButtonClass: 'common-button-primary', roundButton: false }).then(() => { + this.itemsPage = 1 + this.itemsEo.page = 1 this.loading = true this.deleteItemsModal = false this.$http.post('lawss/sarFileSplitItems/batchDeleteItems', { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 0d03bcc99..1341371f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -135,19 +135,19 @@ - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    { if (valid) { this.isSubmit = true - var json = this.json + let json = this.jsonData json.commentText = this.commentText5 json.hzfileId = this.form.hzfileId json.hzfileName = this.form.hzfileName json.docUser = this.newDocUser + json.responUserList = this.tableData this.$http.post('lawss/activiti/completeTask', { json: JSON.stringify(json), taskId: this.taskIds, @@ -427,6 +429,8 @@ pId: this.pId }).then(res => { let data = JSON.parse(res.mesg) + let jsonData = JSON.parse(res.mesg) + this.jsonData = jsonData.form ? jsonData.form : jsonData this.commentText5 = data.commentText5 || '' this.form.title = data.title || data.form.title this.form.processName = data.processName || data.form.processName diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue index 3e22c57c3..61e25d390 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step6.vue @@ -124,20 +124,20 @@
    - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    - - -
    - - -
    -
    -
    + + +
    + + +
    +
    +
    @@ -437,6 +438,7 @@ v-model="plForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > @@ -1181,6 +1183,19 @@ @import '~@/assets/styles/style'; @import '~@/assets/styles/mixins'; .bzjdStep1-1 { + + + .itemsTextBox { + min-height: 300px; + max-height: 500px; + overflow: auto; + line-height: 20px; + /deep/ td { + border: 1px solid #606266; + text-align: center; + } + } + /deep/.el-drawer__container { .prc-content-border { border: none; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 9dbaa8b71..6518e4149 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -446,6 +446,7 @@ v-model="plForm.changePoint" placeholder="请输入国内标准的差异点" maxlength="500" + :autosize="{minRows:10,maxRows:10}" > @@ -1193,6 +1194,17 @@ export default { @import '~@/assets/styles/mixins'; .bzjdStep1 { + + .itemsTextBox { + min-height: 300px; + max-height: 500px; + overflow: auto; + line-height: 20px; + /deep/ td { + border: 1px solid #606266; + text-align: center; + } + } /deep/ .el-drawer__container { .prc-content-border { border: none; diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 129867b83..fa5ff05ce 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -544,6 +544,16 @@ diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 4c6689c4e..2a5b97e61 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -216,6 +216,7 @@
    diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 622a7657e..4d91dab2f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -216,6 +216,7 @@ diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index fd44331f2..b442841bc 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -103,7 +103,7 @@ value-format="yyyy-MM-dd"> - + - + + + + + + + 确认 + + + +
    + +

    点击或拖拽上传文件

    +
    +
    +