Merge branch 'qingban' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/plan/filtersheet/index.vue

@@ -119,10 +119,12 @@
             <el-option
               v-for="item in options"
               :key="item.value"
-              :label="item.label"
               :value="item.value"
               :disabled="item.disabled"
-            />
+            >
+              <span>{{ item.label }}</span>
+              <span style="color: #999; margin-left: 10px;">{{ item.label2 }}</span>
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="签章人员" prop="signatureId">
@@ -350,11 +352,13 @@ const setSeqList = async () => {
       options.value.push({
         value: element.seqNo,
         label: element.seqNo,
+        label2: element.realEndWhen,
       });
     } else {
       options.value.push({
         value: element.seqNo,
         label: element.seqNo,
+        label2: element.realEndWhen,
         disabled: true,
       });
     }

src/views/pro/traceability/components/checkCom.vue

@@ -9,6 +9,8 @@
       :option="option"
       @row-update="updateRow"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <el-button

src/views/pro/traceability/components/equitCom.vue

@@ -9,6 +9,8 @@
       :option="option"
       v-model:page="page"
       @row-update="updateRow"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <el-button

src/views/pro/traceability/components/excelCom.vue

@@ -9,6 +9,9 @@
       :data="data"
       :option="option"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
+    >
     >
       <template #menu="{ size, row, index }">
         <el-button

src/views/pro/traceability/components/faultCom.vue

@@ -9,6 +9,8 @@
       :option="option"
       v-model:page="page"
       @row-update="updateRow"
+      @size-change="dataList"
+      @current-change="dataList"
     />
     <CommonTable
       ref="ctableRef"

src/views/pro/traceability/components/fileCom.vue

@@ -9,6 +9,8 @@
       :option="option"
       @row-update="updateRow"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <a v-if="row.filePath" :href="row.filePath"

src/views/pro/traceability/components/materialsAccessoryCom.vue

@@ -9,6 +9,8 @@
       :data="data"
       :option="option"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <el-button

src/views/pro/traceability/components/materialsCom.vue

@@ -9,6 +9,8 @@
       :data="data"
       :option="option"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <el-button

src/views/pro/traceability/components/mediaCom.vue

@@ -13,6 +13,8 @@
       :option="option"
       v-model:page="page"
       @row-update="updateRow"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ row, index, type }">
         <el-button

src/views/pro/traceability/components/recordCom.vue

@@ -9,6 +9,8 @@
       :option="option"
       @row-update="updateRow"
       v-model:page="page"
+      @size-change="dataList"
+      @current-change="dataList"
     >
       <template #menu="{ size, row, index }">
         <el-button