diff --git a/src/views/oem/oemOrderSettlement/components/inReview.vue b/src/views/oem/oemOrderSettlement/components/inReview.vue
index 62d42304..6aa3fb4c 100644
--- a/src/views/oem/oemOrderSettlement/components/inReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/inReview.vue
@@ -46,7 +46,9 @@ export default {
             },
             approvalType:1,
             showDialog:false,
-            searchParams:{},
+            searchParams:{
+                approvalStatusList:['1','2','5']
+            },
             selectionList:[],
             option:{
                 height: 'auto',
@@ -137,13 +139,48 @@ export default {
                     },
                     {
                         label: '审核状态',
-                        prop: 'approvalStatus',
+                        prop: 'approvalStatusList',
                         sortable: true,
                         filterable: true,
                         span: 24,
                         width: 120,
                         search:true,
+                        hide:true,
+                        type:'select',
+                        multiple:true,
+                        dicData:[
+                            {
+                                label:"待校对",
+                                value:'1'
+                            },
+                            {
+                                label:"校对中",
+                                value:'2'
+                            },
+                            {
+                                label:"待审核",
+                                value:'5'
+                            },
+                            {
+                                label:"审核通过",
+                                value:'3'
+                            },
+                            {
+                                label:"审核不通过",
+                                value:'4'
+                            },
+                        ]
+                    },
+                    {
+                        label: '审核状态',
+                        prop: 'approvalStatus',
+                        sortable: true,
+                        filterable: true,
+                        span: 24,
+                        width: 120,
+                        search:false,
                         type:'select',
+                        // multiple:true,
                         dicData:[
                             {
                                 label:"待校对",
@@ -249,6 +286,10 @@ export default {
         },
         searchReset(){
             this.query = {
+                approvalStatusList:['1','2','5']
+            }
+            this.searchParams = {
+                approvalStatusList:['1','2','5']
             }
             this.onLoad()
         },
@@ -289,6 +330,8 @@ export default {
                 current:this.page.currentPage,
                 size:this.page.pageSize,
                 ...this.query,
+                approvalStatusList:this.query && this.query.approvalStatusList && typeof(this.query.approvalStatusList) == 'object' ?
+                this.query.approvalStatusList.join(',') : this.query.approvalStatusList
             }
             approvalList(params).then(res =>{
                 this.data = res.data.data.records
diff --git a/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue b/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
index 2e0b8dd3..3ae239d8 100644
--- a/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/proofreadingAndReview.vue
@@ -25,21 +25,21 @@
         </div>
         <el-table :data="factoryData" v-if="checkBtn == '1'" v-loading="loading">
             <el-table-column label="#" type="index" width="55px" align="center"></el-table-column>
-            <el-table-column label="厂家代码" prop="ocCode" align="center"></el-table-column>
+            <el-table-column label="厂家代码" prop="ocCode" align="center" width="350px"></el-table-column>
             <el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column>
-            <el-table-column label="结算批数" prop="batchCount" align="center"></el-table-column>
-            <el-table-column label="结算金额(元)" prop="monthAmount" align="center"></el-table-column>
+            <el-table-column label="结算批数" prop="batchCount" align="center" width="280px"></el-table-column>
+            <el-table-column label="结算金额(元)" prop="monthAmount" align="center" width="280px"></el-table-column>
         </el-table>
         <el-table :data="factoryTypeData" v-if="checkBtn == '2'">
             <el-table-column label="#" type="index" width="55px" align="center"></el-table-column>
-            <el-table-column label="厂家代码" prop="ocCode" align="center"></el-table-column>
+            <el-table-column label="厂家代码" prop="ocCode" align="center" width="200px"></el-table-column>
             <el-table-column label="厂家名称" prop="ocName" align="center"></el-table-column>
-            <el-table-column label="结算大类" prop="statementCategory" align="center"></el-table-column>
-            <el-table-column label="结算批数" prop="batchCount" align="center"></el-table-column>
-            <el-table-column label="总面积(dm²)" prop="totalArea" align="center"></el-table-column>
-            <el-table-column label="面积月占比(%)" prop="areaMonthRatio" align="center"></el-table-column>
-            <el-table-column label="月结算金额(元)" prop="monthAmount" align="center"></el-table-column>
-            <el-table-column label="金额月占比(%)" prop="amountMonthRatio" align="center"></el-table-column>
+            <el-table-column label="结算大类" prop="statementCategory" align="center" width="150px"></el-table-column>
+            <el-table-column label="结算批数" prop="batchCount" align="center" width="150px"></el-table-column>
+            <el-table-column label="总面积(dm²)" prop="totalArea" align="center" width="150px"></el-table-column>
+            <el-table-column label="面积月占比(%)" prop="areaMonthRatio" align="center" width="150px"></el-table-column>
+            <el-table-column label="月结算金额(元)" prop="monthAmount" align="center" width="150px"></el-table-column>
+            <el-table-column label="金额月占比(%)" prop="amountMonthRatio" align="center" width="150px"></el-table-column>
         </el-table>
         <template #footer>
             <span class="dialog-footer">
diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
index 6eecf835..efaaa088 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
@@ -287,7 +287,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: true,
-                        width: 120,
+                        width: 180,
                         searchOrder:7,
                     },
                     {
@@ -560,6 +560,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning',
             }).then(() => {
+                this.loading = true;
                 // 调用结算接口
                 const params = {
                     ...this.query,
@@ -574,10 +575,12 @@ export default {
 
                 calculate(params).then(res => {
                     // 获取返回的数据
-                    this.$message.success('结算成功');
+                    this.$message.success('操作完成');
                     this.onLoad();
+                    this.loading = false;
                 }).catch(() => {
                     // this.$message.error('结算失败');
+                    this.loading = false;
                 });
             }).catch(() => {
                 // 用户点击取消
@@ -597,6 +600,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning',
             }).then(() => {
+                this.loading = true;
                 let params = {
                     ...this.query,
                     postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0],
@@ -607,10 +611,12 @@ export default {
                 if(params.putStoreTime) delete params.putStoreTime;
                 console.log('params----------',params)
                 noSettlementItem(params).then(() => {
-                    this.$message.success('无需结算成功');
+                    this.$message.success('操作完成');
                     this.onLoad();
+                    this.loading = false;
                 }).catch(() => {
                     // this.$message.error('无需结算失败');
+                    this.loading = false;
                 });
             }).catch(() => {
                 // 用户点击取消
diff --git a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
index 50a4c594..425f0608 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
@@ -279,7 +279,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: true,
-                        width: 120,
+                        width: 180,
                         searchOrder:7,
                     },
                     {
@@ -369,7 +369,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: false,
-                        width: 120,
+                        width: 180,
                     },
                     {
                         label: '计量单位',
diff --git a/src/views/oem/oemOrderSettlement/components/underReview.vue b/src/views/oem/oemOrderSettlement/components/underReview.vue
index 774d065f..e086067c 100644
--- a/src/views/oem/oemOrderSettlement/components/underReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/underReview.vue
@@ -44,6 +44,7 @@
     clearable>
                         <el-option label="订单数据错误" value="订单数据错误"></el-option>
                         <el-option label="无需结算" value="无需结算"></el-option>
+                        <el-option label="未找到报价单" value="未找到报价单"></el-option>
                     </el-select>
                 </el-form-item>
             </el-form>
@@ -313,7 +314,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: true,
-                        width: 120,
+                        width: 180,
                         searchOrder:6,
                     },
                     {
@@ -412,7 +413,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: false,
-                        width: 120,
+                        width: 180,
                     },
                     {
                         label: '计量单位',
@@ -602,6 +603,7 @@ export default {
         summitSettle(){
             this.$refs.settleForm.validate(valid => {
                 if(valid){
+                    this.loading = true;
                     let params = {
                         ids:this.selectionList.map(item => item.id),
                         ...this.settleForm,
@@ -610,10 +612,13 @@ export default {
                     console.log('params----------',params)
                     confirmSettlement(params).then(res =>{
                         if(res.data.code == 200){
-                            this.$message.success('确认结算成功');
+                            this.$message.success('操作完成');
                             this.isConfirm = false
                             this.onLoad()
+                            this.loading = false;
                         }
+                    }).catch(() =>{
+                        this.loading = false;
                     })
                     // this.$message.success('结算成功！')
                     // this.isConfirm = false
diff --git a/src/views/oem/oemOrderSettlement/components/unsettled.vue b/src/views/oem/oemOrderSettlement/components/unsettled.vue
index f0e81e6d..8f952fe9 100644
--- a/src/views/oem/oemOrderSettlement/components/unsettled.vue
+++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue
@@ -356,7 +356,7 @@ export default {
                         filter: true,
                         span: 24,
                         search: true,
-                        width: 120,
+                        width: 180,
                         searchOrder:6,
                     },
                     {
@@ -598,6 +598,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning',
             }).then(() => {
+                this.loading = true;
                 // 调用结算接口
                 const params = {
                     ...this.query,
@@ -610,11 +611,13 @@ export default {
 
                 calculate(params).then(res => { 
                     if(res.data.code == 200){
-                        this.$message.success('结算成功');
+                        this.$message.success('操作完成');
                         this.onLoad();
+                        this.loading  = false;
                     }
                 }).catch(() => {
                     // this.$message.error('结算失败');
+                    this.loading  = false;
                 });
 
                 // oemSettleAccountsItem(params).then(res => {
@@ -684,7 +687,7 @@ export default {
                     preSettlement(params).then(res =>{
                         console.log('res----------',res)
                         if(res.data){
-                            this.$message.success('预结算成功')
+                            this.$message.success('操作完成')
                             this.openSettle = false
                             NProgress.start();
                             downloadXls(res.data, `预结算数据表${this.$dayjs().format('YYYY-MM-DD')}.xlsx`);
@@ -710,6 +713,7 @@ export default {
         summitSupplement(){
             this.$refs.supplementForm.validate(valid =>{
                 if(valid){
+                    this.loading = true
                     let params = {
                         ...this.supplementForm,
                         postPlatingStorageTimeStart:this.supplementForm && this.supplementForm.putStoreTime && this.supplementForm.putStoreTime[0],
@@ -719,10 +723,13 @@ export default {
                         console.log('params----------',params)
                         supplement(params).then(res =>{
                             if(res.data.code == 200){
-                                this.$message.success('补充结算成功');
+                                this.$message.success('操作完成');
                                 this.openSupplement = false
                                 this.onLoad()
+                                this.loading = false
                             }
+                        }).catch(() =>{
+                            this.loading = false
                         })
                     }
             })
@@ -741,6 +748,7 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning',
             }).then(() => {
+                this.loading = true;
                 let params = {
                     ...this.query,
                     postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime[0],
@@ -749,10 +757,12 @@ export default {
                 if(params.putStoreTime) delete params.putStoreTime;
                 console.log('params----------',params)
                 noSettlementItem(params).then(() => {
-                    this.$message.success('无需结算成功');
+                    this.$message.success('操作完成');
                     this.onLoad();
+                    this.loading = false;
                 }).catch(() => {
                     // this.$message.error('无需结算失败');
+                    this.loading = false;
                 });
             }).catch(() => {
                 // 用户点击取消
diff --git a/src/views/oem/oemOrderSettlement/index.vue b/src/views/oem/oemOrderSettlement/index.vue
index c41672e7..40afc7f4 100644
--- a/src/views/oem/oemOrderSettlement/index.vue
+++ b/src/views/oem/oemOrderSettlement/index.vue
@@ -8,12 +8,12 @@
             <el-tab-pane label="审核中" name="6" v-if="permission.inReview_list"></el-tab-pane>
              <el-tab-pane label="结算完成" name="4" v-if="permission.settlementCompleted_list"></el-tab-pane>
         </el-tabs>
-        <unsettled v-if="activeName=='1' && permission.unsettled_list"></unsettled>
-        <!-- <settlementIn v-if="activeName=='2'"></settlementIn> -->
-        <settlementAnomaly v-if="activeName=='3' && permission.settlementAnomaly_list"></settlementAnomaly>
-        <settlementCompleted v-if="activeName=='4' && permission.settlementCompleted_list"></settlementCompleted>
-        <underReview v-if="activeName=='2' && permission.underReview_list"></underReview>
-        <inReview v-if="activeName == '6' && permission.inReview_list"></inReview>
+        <unsettled v-show="activeName=='1' && permission.unsettled_list"></unsettled>
+        <!-- <settlementIn v-show="activeName=='2'"></settlementIn> -->
+        <settlementAnomaly v-show="activeName=='3' && permission.settlementAnomaly_list"></settlementAnomaly>
+        <settlementCompleted v-show="activeName=='4' && permission.settlementCompleted_list"></settlementCompleted>
+        <underReview v-show="activeName=='2' && permission.underReview_list"></underReview>
+        <inReview v-show="activeName == '6' && permission.inReview_list"></inReview>
         
     </basic-container>
 </template>
diff --git a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
index 9f0664b5..38dd09fb 100644
--- a/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
+++ b/src/views/qualityManagement/inspectionArchiving/ERecord/printDialog.vue
@@ -9,8 +9,8 @@
             <div style="width: 88%;text-align:center;">热表分厂质量记录卡</div> 
           </div> -->
           <div class="fixTopLeft">JONHON受控</div>
-          <div class="printTitle">热表分厂质量记录卡</div>
-          <div class="tableNo" style="text-align: left;width: 180px;float: right;">表号：</div>
+          <div class="printTitle" style="color:#000;">热表分厂质量记录卡</div>
+          <div class="tableNo" style="text-align: left;width: 180px;float: right;color:#000;">表号：</div>
           <table id="cus-table" cellspacing="0">
             <template v-if="modelOne!= null && modelOne.dsPart!= null">
               <tr>
@@ -52,12 +52,12 @@
             </template>
            <template v-if="modelTwo && modelTwo.length>0">
               <tr>
-                <td colspan="9" style="font-size:21px;">生产过程</td>
+                <td colspan="9" style="font-size:21px;font-weight:550;">生产过程</td>
               </tr>
               <template v-for="(item,index) in modelTwo" >
                 <tr v-if="index != 0" style="height: 20px;"></tr>
                 <tr>
-                  <td colspan="9" style="font-size:16px;">
+                  <td colspan="9" style="font-size:16px;font-weight:550;">
                     {{item.orders}} - {{item.procedureSet.ppsName}} 工序详情
                   </td>
                 </tr>
@@ -773,7 +773,7 @@ export default {
     font-size: 22px;
     font-weight: 700;
     padding: 8px;
-    color:#606266
+    color: #000000;
     // margin-bottom: 6px;
   }
 
@@ -814,7 +814,7 @@ export default {
 }
 .fixTopLeft{
   // position: fixed;
-  float: left;
+  // position: absolute;
   top: 1;
   left: 0;
   font-family: 'SimHei';
diff --git a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue
index f16d7d05..ae2af525 100644
--- a/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue
+++ b/src/views/qualityManagement/inspectionArchiving/auditFile/index.vue
@@ -6,6 +6,7 @@
       :table-loading="loading"
       :data="data"
       v-model="form"
+      v-model:search="search"
       v-model:page="page"
       ref="crud"
       @row-update="rowUpdate"
@@ -26,7 +27,6 @@
         <span v-show="type == 'edit' || type == 'add'">
           <jhSelect
             :value="form.caId"
-            @input="val => (form.caId = val)"
             placeholder="请搜索选择"
             api-url="/blade-desk/BA/craftAbility/list"
             echo-api="/blade-desk/BA/craftAbility/list"
@@ -43,6 +43,44 @@
           />
         </span>
       </template>
+      <template #ppsId-form="{type}">
+        <span v-show="type == 'edit' || type == 'add'">
+          <jhSelect
+            :value="form.ppsId"
+            placeholder="请搜索选择"
+            api-url="/api/blade-desk/bsProcessSet/list"
+            echo-api="/api/blade-desk/bsProcessSet/list"
+            echoParamsKey="ids"
+            echo-method="get"
+            api-method="get"
+            list-key="records"
+            total-key="total"
+            label-key="name"
+            value-key="id"
+            search-key="name"
+            :debounce-time="500"
+            :title="'修改'"
+          />
+        </span>
+      </template>
+      <template #ppsId-search="{ disabled, size }">
+          <jhSelect
+            :value="search.ppsId"
+            @input="val => (search.ppsId = String(val))"
+            placeholder="请搜索选择"
+            api-url="/api/blade-desk/bsProcessSet/list"
+            echo-api="/api/blade-desk/bsProcessSet/list"
+            echoParamsKey="ids"
+            echo-method="get"
+            api-method="get"
+            list-key="records"
+            total-key="total"
+            label-key="name"
+            value-key="id"
+            search-key="name"
+            :debounce-time="500"
+          />
+      </template>
     </avue-crud>
   </basic-container>
 </template>
@@ -61,6 +99,7 @@ export default {
         currentPage: 1,
         total: 0,
       },
+      search:{},
       query:{},
       option: {
         height: 'auto',
@@ -119,23 +158,39 @@ export default {
         // },
         column: [
           {
-            label: '工序',
+            label:'工序',
             prop: 'ppsId',
             labelWidth: 150,
+            search:true,
+            hide:true,
+            span: 24,
+            rules: [
+              {
+                required: true,
+                message: '请选择工序',
+                trigger: 'click',
+              },
+            ],
+          },
+          {
+            label: '工序',
+            prop: 'ppsName',
+            labelWidth: 150,
             // bind: 'bsProcedureSet.ppsName',
-            search: true,
+            search: false,
             sortable: 'custom',
             width: 150,
             span: 24,
-            type: 'select',
+            // type: 'select',
             filterable: true,
             remote: true,
-            dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`,
-            props:{
-              label: 'name',
-              value: 'id',
-              res: 'data.records',
-            },
+            display:false,
+            // dicUrl:`/api/blade-desk/bsProcessSet/list?name={{key}}`,
+            // props:{
+            //   label: 'name',
+            //   value: 'id',
+            //   res: 'data.records',
+            // },
             rules: [
               {
                 required: true,
@@ -329,7 +384,9 @@ export default {
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      this.query = params;
+      console.log('params----------',params)
+      console.log('search----------',this.search)
+      this.query = this.search;
       // this.page.currentPage = 1;
       this.onLoad();
       done();