制度附件功能调整

src/views/processmaterials/modules/ProcessUdgetPlanForm.vue

@@ -367,7 +367,6 @@
     },
     methods: {
       addBefore(){
-        alert(3)
         this.form.resetFields()
         this.processUdgetPlanMaterialTable.dataSource=[]
       },

src/views/regime/ProcessRegimeList.vue

@@ -81,9 +81,13 @@
           <j-ellipsis :value="text" :length="10"/>
         </span>
 
+
         <template slot="htmlSlot" slot-scope="text">
           <div v-html="$options.filters.setContent(text)"></div>
         </template>
+        <span slot="fileName" slot-scope="text, record">
+          <j-ellipsis :value="text" :length="20"/>
+        </span>
         <template slot="imgSlot" slot-scope="text,record">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
           <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
@@ -100,7 +104,6 @@
             下载
           </a-button>
         </template>
-
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
 
@@ -140,7 +143,8 @@
   import { mixinDevice } from '@/utils/mixin'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ProcessRegimeModal from './modules/ProcessRegimeModal'
-  import { getAction } from '../../api/manage'
+
+  import { getAction, getRecord } from '../../api/manage'
 
   export default {
     name: 'ProcessRegimeList',
@@ -151,7 +155,6 @@
     data () {
       return {
         description: 'process_regime管理页面',
-        // 表头
         columns: [
           {
             title: '序号',
@@ -199,6 +202,13 @@
           //   align:"center",
           //   dataIndex: 'delFalg'
           // },
+          {
+            title: '文件名称',
+            align: "center",
+            width: 200,
+            scopedSlots: { customRender: 'fileName' },
+            dataIndex: 'ossFileListName'
+          },
           {
             title: '操作',
             dataIndex: 'action',
@@ -206,11 +216,12 @@
             fixed:"right",
             width:147,
             scopedSlots: { customRender: 'action' }
-          }
+          },
         ],
         url: {
           list: "/regime/processRegime/list",
           delete: "/regime/processRegime/delete",
+          add: "/regime/processRegime/add",
           deleteBatch: "/regime/processRegime/deleteBatch",
           exportXlsUrl: "/regime/processRegime/exportXls",
           importExcelUrl: "regime/processRegime/importExcel",
@@ -218,9 +229,11 @@
         },
         dictOptions:{},
         superFieldList:[],
+        ossFileList:[], //文件列表
       }
     },
     created() {
+      this.loadData();
     this.getSuperFieldList();
     },
     computed: {
@@ -236,16 +249,59 @@
           return value.slice(0, 300) + "...";
         }
         return value;
+      },
+      setFileName(value){
+        console.log(">>>>>>>",value)
       }
     },
     methods: {
+      loadData(arg) {
+        if(!this.url.list){
+          this.$message.error("请设置url.list属性!")
+          return
+        }
+        if (arg === 1) {
+          this.ipagination.current = 1;
+        }
+        var params = this.getQueryParams();//查询条件
+        // this.loading = true;
+        getAction(this.url.list, params).then((res) => {
+          if (res.success) {
+            let aaa = res.result.records||res.result;
+            aaa.forEach(data=>{
+              if (!!data.ossFileList){
+                data.ossFileList.forEach(item=>{
+                      if (!!item.name){
+                        console.log("item.name>>>>>>>>>>>>>",item.name)
+                        data.ossFileListName = item.name;
+                      }
+                    })
+              }
+            })
+            this.dataSource = aaa;
+          }
+          if(res.code===510){
+            this.$message.warning(res.message)
+          }
+          this.loading = false;
+        })
+      },
+
       initDictConfig(){
       },
+      //清空表单内容
+      onClearSelected() {
+
+      },
+      //新增制度，这里需要对表单内的附件信息进行清理
+      // handleAdd(){
+      //   this.onClearSelected();
+      // },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'string',value:'title',text:'标题',dictCode:''})
         fieldList.push({type:'Text',value:'contentDetails',text:'内容',dictCode:''})
-        fieldList.push({type:'Text',value:'contentDetails',text:'内容',dictCode:''})
+        fieldList.push({type:'string',value:'ossFileList',text:'附件名称',dictCode:''})
         fieldList.push({type:'date',value:'createTime',text:'创建时间'})
         fieldList.push({type:'int',value:'states',text:'状态',dictCode:''})
         fieldList.push({type:'int',value:'delFalg',text:'删除标志',dictCode:''})
@@ -255,7 +311,7 @@
   }
 </script>
 <style scoped>
-  @import '~@assets/less/common.less';
+  /*@import '~@assets/less/common.less';*/
 
 
   /*.ant-table-tbody > tr > td,*/

src/views/regime/modules/ProcessRegimeForm.vue

@@ -9,15 +9,23 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24" >
-            <a-form-item label="附件" >
+            <a-form-item label="附件" prop="ossFileList">
               <j-upload v-decorator="['fileId']" :trigger-change="true" style="z-index: 999"></j-upload>
+<!--              <br/>-->
+              <span v-for="item in ossFileList">
+               <a :href="item.url" >{{item.name}}</a>
+             </span>
+<!--              <FileList  v-decorator="['ossFileList']" ></FileList>-->
             </a-form-item>
+
+
+
           </a-col>
-          <a-col :span="24">
-            <a-form-model-item label="文件" prop="ossFileList"  v-show="false">
-              <FileList  v-decorator="['ossFileList']"></FileList>
-            </a-form-model-item>
-          </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="文件" prop="ossFileList"  v-show="false">-->
+<!--              <FileList  v-decorator="['ossFileList']" ></FileList>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="内容"  prop="contentDetails">
               <j-editor v-model="model.contentDetails" />
@@ -84,7 +92,9 @@
           add: "/regime/processRegime/add",
           edit: "/regime/processRegime/edit",
           queryById: "/regime/processRegime/queryById"
-        }
+        },
+        ossFileList:null
+
       }
     },
     computed: {
@@ -103,7 +113,8 @@
       edit (record) {
         if (record.id) {
           //1、文件回显
-          record = getRecord(record)
+          console.log("文件回显>>>>>>>>",record)
+          this.ossFileList = record.ossFileList
         }
         this.model = Object.assign({}, record);
         this.visible = true;

src/views/regime/modules/ProcessRegimeModal.vue

@@ -48,13 +48,15 @@
       },
       handleOk () {
         this.$refs.realForm.submitForm();
+        this.$refs.realForm.ossFileList=null;
       },
       submitCallback(){
         this.$emit('ok');
         this.visible = false;
       },
       handleCancel () {
-        this.close()
+        this.close();
+        this.$refs.realForm.ossFileList=null;
       }
     }
   }

src/views/suppliesstronger/ProcessSuppliesStrongerList.vue

@@ -67,9 +67,7 @@
         :pagination="ipagination"
         :loading="loading"
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        :height="gloable_tableHeight"
         @change="handleTableChange">
-
           <span slot="merchandiseName" slot-scope="text, record">
             <j-ellipsis :value="text" :length="39"/>
           </span>