diff --git a/src/components/hzwlComponents/UploadFormItem.vue b/src/components/hzwlComponents/UploadFormItem.vue index d35849758..e34615f83 100644 --- a/src/components/hzwlComponents/UploadFormItem.vue +++ b/src/components/hzwlComponents/UploadFormItem.vue @@ -60,13 +60,59 @@ :on-success="onSuccess" :on-preview="onPreview" :on-remove="removeOneFile" - :show-file-list="true" + :show-file-list="false" >

点击或拖拽上传文件

+ + + + + @@ -120,6 +166,13 @@ export default { fileMadel: false, fileList: [], // 用于el-upload FileList: [], // 用于回显 + + openModifyFileNameDialog: false, + modifyFile: { + fileName: '', + fileId: '' + }, + modifyFileNameLoading: false } }, created () { @@ -234,6 +287,42 @@ export default { this.$preview(attId) } }, + handleRemoveFile (file) { + const fileList = [] + this.FileList.forEach(item => { + if (item.id !== file.id) { + fileList.push(item) + } + }) + this.removeOneFile(file, fileList) + }, + handleModifyName (file) { + this.modifyFile.fileName = file.name + this.modifyFile.fileId = file.id + this.openModifyFileNameDialog = true + }, + handleModifyNameSubmite () { + this.modifyFileNameLoading = true + this.$http.get('att/attFile/updateFileName', this.modifyFile, { + _this: this + }, res => { + if(res.ok) { + this.modifyFileNameLoading = false + this.openModifyFileNameDialog = false + this.FileList.forEach(item => { + if(item.id === this.modifyFile.fileId) { + item.name = this.modifyFile.fileName + } + }) + const ids = this.FileList.map(item => item.id).join(',') + const names = this.FileList.map(item => item.name).join(',') + this.$emit('update:ids', ids) + this.$emit('update:names', names) + } + }, e => { + this.modifyFileNameLoading = false + }) + }, } } @@ -250,4 +339,12 @@ export default { background: #fff3f3; z-index: 9; } +.el-upload-list__item .el-icon-edit{ + position: absolute; + top: 5px; + right: 25px; + cursor: pointer; + opacity: .75; + color: #606266; +} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 574efe6ee..2fbe3a883 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1426,13 +1426,58 @@ :before-upload="beginImportFile" :on-success="importFileSuccess" :on-remove="removeOneFile" - :show-file-list="true" + :show-file-list="false" >

点击或拖拽上传文件

+ + + + + { + const fileId = file.id || file.response.data.id + const itemId = item.id || item.response.data.id + if (fileId !== itemId) { + fileList.push(item) + } + }) + this.fileList = fileList + this.removeOneFile(file, fileList) + }, + handleModifyName (file) { + this.modifyFile.fileName = file.name + this.modifyFile.fileId = file.id || file.response.data.id + this.openModifyFileNameDialog = true + }, + handleModifyNameSubmite () { + this.modifyFileNameLoading = true + this.$http.get('att/attFile/updateFileName', this.modifyFile, { + _this: this + }, res => { + if(res.ok) { + this.modifyFileNameLoading = false + this.openModifyFileNameDialog = false + this.fileList.forEach(item => { + const id = item.id || item.response.data.id + if(id === this.modifyFile.fileId) { + item.name = this.modifyFile.fileName + } + }) + this.removeOneFile('_', this.fileList) + } + }, e => { + this.modifyFileNameLoading = false + }) + }, // 新增 productAdd () { this.productModal = true @@ -3609,7 +3697,7 @@ export default { // } // this.form.zbjbdName += response.data.name+','; // } - + this.fileList = fileList switch (this.fileType) { case 'fbgbjbd': this.FBGBJBDFileList = fileList; @@ -4419,4 +4507,12 @@ export default { height: 8%; } } +.el-upload-list__item .el-icon-edit{ + position: absolute; + top: 5px; + right: 25px; + cursor: pointer; + opacity: .75; + color: #606266; +} diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index e3174d6e0..8a7af236f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -10,7 +10,7 @@
审批历史
-
+
+ /> - + + /> - - + + + :defaultProps="defaultProps" + :checkedKeys="defaultCheckedKeys" + :nodeKey="nodeKey" + @popoverHide="popoverHide" + @popoverHideCancel="popoverHideCancel" + /> @@ -70,40 +82,40 @@ + /> - + + v-for="item in countryOptions" + :key="item.value" + placeholder="请选择" + :value="item.value" + :label="item.label" + /> + v-model="form.standNumber" + placeholder="请输入标准编号" + clearable + /> + /> @@ -111,29 +123,37 @@ v-model="form.issueTime" type="date" value-format="yyyy-MM-dd" - placeholder="请选择标准发布日期"> - + placeholder="请选择标准发布日期" + /> - + + /> @@ -145,7 +165,7 @@ autosize placeholder="请输入标准英文名称" clearable - > + /> @@ -164,32 +184,36 @@ v-model="form.gxhbq" placeholder="请输入标签" clearable - > + /> - + /> + - + @click.native="choiceTree('treeListName', '归档位置', form.treeListName)" + /> + :defaultProps="defaultProps" + :checkedKeys="treeCheckedKeys" + :nodeKey="nodeKey" + @popoverHide="treeHide" + @popoverHideCancel="treeHideCancel" + /> @@ -201,15 +225,15 @@ + /> + /> @@ -227,10 +251,10 @@ - + :config="{attrName:'新车型实施日期(标准文本)',attrField:'xcxssrq'}" + :disabled="false" + /> @@ -412,14 +436,20 @@ + />
-
+
{{ item.name }}
@@ -429,22 +459,29 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('xgd')"> - + @click="fileUpload('xgd')" + > +
+ />
-
+
{{ item.name }}
@@ -454,15 +491,16 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('fbgbjbd')"> - + @click="fileUpload('fbgbjbd')" + > +
-
- {{ value.name }} +
+ {{ value.name }}
- - @@ -470,14 +508,20 @@ + />
-
+
{{ item.name }}
@@ -487,22 +531,29 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('ssg')"> - + @click="fileUpload('ssg')" + > +
+ />
-
+
{{ item.name }}
@@ -512,22 +563,29 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('ca')"> - + @click="fileUpload('ca')" + > +
+ />
-
+
{{ item.name }}
@@ -537,8 +595,9 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('zbjbd')"> - + @click="fileUpload('zbjbd')" + > +
@@ -658,17 +717,22 @@ - + />
-
+
{{ item.name }}
@@ -678,22 +742,29 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('kwj')"> - + @click="fileUpload('kwj')" + > +
+ />
-
+
{{ item.name }}
@@ -703,8 +774,9 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('xdb')"> - + @click="fileUpload('xdb')" + > +
@@ -713,14 +785,20 @@ + />
-
+
{{ item.name }}
@@ -730,8 +808,9 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('jdwj')"> - + @click="fileUpload('jdwj')" + > +
@@ -739,14 +818,20 @@ + />
-
+
{{ item.name }}
@@ -756,22 +841,29 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('bpg')"> - + @click="fileUpload('bpg')" + > +
+ />
-
+
{{ item.name }}
@@ -781,8 +873,9 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('zqyjg')"> - + @click="fileUpload('zqyjg')" + > +
@@ -818,18 +911,18 @@ @@ -854,87 +947,107 @@ - + + :defaultProps="defaultCodeProps" + :checkedKeys="defaultCheckedKeys1" + :nodeKey="nodeKeyCode" + @popoverHide="popoverHideBusVs" + @popoverHideCancel="popoverHideBusVsCancel" + /> - + + :defaultProps="defaultCodeProps" + :checkedKeys="defaultCheckedKeys2" + :nodeKey="nodeKeyCode" + @popoverHide="popoverHideCarVs" + @popoverHideCancel="popoverHideCarVsCancel" + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + /> @@ -972,10 +1085,10 @@ @@ -1013,13 +1126,13 @@ v-model="form.cycvppscn = ''" disabled clearable - > + /> + />
+ /> + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + /> - + + /> @@ -1099,33 +1211,34 @@ - + + v-model="form.dtbjh" + type="textarea" + placeholder="请输入代替标准号" + clearable + /> + v-else + v-model="form.dtbjh" + type="textarea" + placeholder="请输入代替标准号" + clearable + /> {{ '手动查找' }} + > + {{ '手动查找' }} - + @@ -1137,14 +1250,20 @@ + />
-
+
{{ item.name }}
@@ -1154,68 +1273,70 @@ class="common-button-primary" size="mini" style="margin-left: 10px; margin-top: 11px; float: right;" - @click="fileUpload('glwj')"> - + @click="fileUpload('glwj')" + > +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + v-model="form.cbbh" + type="textarea" + placeholder="请输入采标编号" + clearable + /> + v-else + v-model="form.cbbh" + type="textarea" + placeholder="请输入采标编号" + clearable + /> {{ '手动查找' }} + > + {{ '手动查找' }} @@ -1242,37 +1363,38 @@ - + + /> + /> {{ '手动查找' }} + > + {{ '手动查找' }}
+ v-model="commentText" + title="回执说明" + />
@@ -1295,14 +1417,14 @@
-
+

流程发起人

- +
@@ -1310,8 +1432,7 @@

责任人

- - +
@@ -1319,7 +1440,7 @@

责任人

- +
@@ -1327,7 +1448,7 @@

标准法规工程师

- +
@@ -1335,18 +1456,18 @@

责任对接人,标准法规部部门负责人

- +
-
-
+
+
- + type="index" + width="55" + label="序号" + align="center" + /> - + /> - + /> + align="center" + > @@ -1384,7 +1504,8 @@ + align="center" + > @@ -1392,7 +1513,8 @@ + align="center" + > @@ -1400,7 +1522,8 @@ + align="center" + > @@ -1417,49 +1540,100 @@ :saveLoading="saveLoading" @save="handleSave" @submit="handleSubmit" + /> + - -
- +

点击或拖拽上传文件

+ +
+ + +
- + - - + @change="dataSourceChange" + > + + @@ -1467,21 +1641,24 @@ v-model="replaceLawsNumForm.standNumber" placeholder="根据标准编号查找" clearable - :maxlength="100"> + :maxlength="100" + /> + :maxlength="100" + /> + @click="getReplaceLawsNumRowFirst" + > 查询 @@ -1490,7 +1667,8 @@ class="common-button-default" size="mini" type="default" - @click="getResetLawsNumRow"> + @click="getResetLawsNumRow" + > 清空 @@ -1505,24 +1683,27 @@ border :height="300" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', - fontWeight: 'bold', height: '48px'}" - @selection-change="selectReplaceStandNumRowChange"> + fontWeight: 'bold', height: '48px'}" + @selection-change="selectReplaceStandNumRowChange" + > - + align="center" + /> + type="index" + width="55" + label="序号" + align="center" + > + label="标准编号" + >