Merge remote-tracking branch 'origin/dev' into dev

src/views/dataFilling/fileManagement.vue

@@ -7,7 +7,7 @@
             <el-form ref="queryFormRef" :model="queryParams">
               <el-row :gutter="20">
                 <el-col :span="6">
-                  <el-form-item label="字段名称：" prop="table_name" label-width="auto">
+                  <el-form-item label="表格名称：" prop="field_comment" label-width="auto">
                     <el-input v-model="queryParams.field_comment" placeholder="请输入内容"></el-input>
                   </el-form-item>
                 </el-col>
@@ -84,8 +84,6 @@ const data = reactive({
   queryParams: {
     page: 1,
     pageSize: 10,
-    field_name: '',
-    creator_id: '',
     field_comment: ''
   }
 });
@@ -109,7 +107,7 @@ const handleQuery = () => {
   fetchFillList();
 };
 const resetQuery = () => {
-  queryParams.value = { page: 1, pageSize: 10, field_name: '' };
+  queryParams.value = { page: 1, pageSize: 10, field_comment: '' };
   handleQuery();
 };
 const handleSelectionChange = (selection) => {
@@ -118,7 +116,6 @@ const handleSelectionChange = (selection) => {
 //收取
 const handleWrite = (row) => {
   if (row) {
-    // debugger
     const data = {
       report_id: row.report_id,
       creator_id: 3,

src/views/dataFilling/fillingManage.vue

@@ -15,22 +15,8 @@
                 <!-- 表格状态 -->
                 <el-col :span="6">
                   <el-form-item label="表格状态：" prop="status">
-<!--                    <el-radio-group v-model="form.task_status">-->
-<!--                      <el-radio value="0" size="large">在用</el-radio>-->
-<!--                      <el-radio value="1" size="large">禁止</el-radio>-->
-<!--                    </el-radio-group>-->
-                    <el-select
-                      v-model="queryParams.status"
-                      clearable
-                      placeholder="请选择"
-                      style="width: 240px"
-                    >
-                      <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
+                    <el-select v-model="queryParams.status" clearable placeholder="请选择" style="width: 240px">
+                      <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -50,22 +36,8 @@
                 <!-- 下发状态 -->
                 <el-col :span="6">
                   <el-form-item label="发布状态：" prop="issued_status">
-<!--                    <el-radio-group v-model="queryParams.issued_status">-->
-<!--                      <el-radio value="0" size="large">待发布</el-radio>-->
-<!--                      <el-radio value="1" size="large">已发布</el-radio>-->
-<!--                    </el-radio-group>-->
-                    <el-select
-                      v-model="queryParams.issued_status"
-                      clearable
-                      placeholder="请选择"
-                      style="width: 240px"
-                    >
-                      <el-option
-                        v-for="item in options1"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
+                    <el-select v-model="queryParams.issued_status" clearable placeholder="请选择" style="width: 240px">
+                      <el-option v-for="item in options1" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -142,21 +114,23 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const options = [
   {
     value: '1',
-    label: '禁止',
+    label: '禁止'
   },
   {
     value: '0',
-    label: '在用',
-  }]
+    label: '在用'
+  }
+];
 const options1 = [
   {
     value: '1',
-    label: '待发布',
+    label: '待发布'
   },
   {
     value: '2',
-    label: '已发布',
-  }]
+    label: '已发布'
+  }
+];
 let issuedState = reactive({
   show: false,
   id: ''
@@ -180,7 +154,7 @@ const data = reactive({
     release_status: '',
     task_status: '',
     status: '',
-    issued_status:''
+    issued_status: ''
   }
 });
 
@@ -221,7 +195,7 @@ const fetchFillList = () => {
   // params.issued_status = !queryParams.value.issued_status ? [] : [queryParams.value.issued_status];
   fillingSelect(params)
     .then((res) => {
-      for(let i = 0; i < res.data.length; i++) {
+      for (let i = 0; i < res.data.length; i++) {
         res.data[i].end_time = parseTime(res.data[i].end_time);
         res.data[i].start_time = parseTime(res.data[i].start_time);
       }