update 标准征求意见流程

src/components/JExpandTable.vue

@@ -38,7 +38,8 @@
                 <template v-else-if="form.fieldShowType === 2">
                   <j-upload
                     v-model="record[form.dbFieldName]"
-                    :disabled="form.isDisabled || false">
+                    :disabled="form.isDisabled || false"
+                    :file-type="form.fileType || canUploadType">
                   </j-upload>
                 </template>
                 <template v-else-if="form.fieldShowType === 3">
@@ -76,7 +77,8 @@
             <template v-else-if="form.fieldShowType === 2">
               <j-upload
                 v-model="record[form.dbFieldName]"
-                :disabled="form.isDisabled || false">
+                :disabled="form.isDisabled || false"
+                :file-type="form.fileType || canUploadType">
               </j-upload>
             </template>
             <template v-else-if="form.fieldShowType === 3">
@@ -208,15 +210,17 @@ export default {
       },
       wrapperCol: {
         sm: 16
-      }
+      },
+      // 本系统限制可以上传的文件格式
+      canUploadType: 'pdf,docx,doc,xlsx,xls,ppt,pptx,rar,zip,jpg,jpeg,png,avi,wmv,mov,rm,mp4,cad'
     }
   },
   methods: {
     submit () {
       const arr = []
       for (const i in this.dataSource) {
-        if (this.$refs[`ruleForm${i}`]) {
-          this.$refs[`ruleForm${i}`].validate(valid => {
+        if (this.$refs[`ruleForm${i}`][0]) {
+          this.$refs[`ruleForm${i}`][0].validate(valid => {
             arr[i] = valid
           })
         } else {

src/components/selection/StandardSelectionModal.vue

@@ -30,8 +30,8 @@
             </a-col>
             <div style="float: right;overflow: hidden;margin-right: 41px;margin-bottom: 20px"
                  class="table-page-search-submitButtons">
-              <a-button style="margin-left: 8px" type="primary" icon="search" @click="searchQuery">{{$t('query')}}</a-button>
-              <a-button style="margin-left: 8px" type="primary" ghost icon="reload" @click="searchReset">{{$t('reset')}}</a-button>
+              <a-button style="margin-left: 8px" type="primary" icon="search" @click="searchQuery">{{ $t('query') }}</a-button>
+              <a-button style="margin-left: 8px" type="primary" ghost icon="reload" @click="searchReset">{{ $t('reset') }}</a-button>
             </div>
           </a-row>
         </a-form>
@@ -99,9 +99,17 @@ export default {
     },
     // 列表数据不包含的标准
     excludeStandardNumbers: {
-      type:String,
+      type: String,
       required: false,
       default: null
+    },
+    // 过滤条件
+    filters: {
+      type: Object,
+      required: false,
+      default: () => {
+        return {}
+      }
     }
   },
   data () {
@@ -186,10 +194,15 @@ export default {
     replacePage () {
       const query = {
         ...this.queryParam,
+        ...this.filters,
         pageNo: this.ipagination.current,
         pageSize: this.ipagination.pageSize,
         excludeStandardNumbers: this.excludeStandardNumbers
       }
+      // 清空在可选范围内进行查询
+      if (!query.source && this.canSelectedSource.length < 3) {
+        query.source = this.canSelectedSource.join(',')
+      }
       // this.selectedRowKeys = []
       this.loading = true
       getStandardList(query).then((res) => {