diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue
index 839ac6e..36d34ed 100644
--- a/src/views/modules/yieldReport/com_finish_roll.vue
+++ b/src/views/modules/yieldReport/com_finish_roll.vue
@@ -7,7 +7,7 @@
         <!-- 菜单信息 -->
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="'当前时间'">
+            <el-form-item :label=labels.currentTime>
               <el-date-picker disabled="disabled" style="width: 145px;"
                               v-model="pageData.reportedTime"
                               format="yyyy-MM-dd HH:mm:ss"
@@ -15,10 +15,6 @@
                               placeholder="">
               </el-date-picker>
             </el-form-item>
-            <el-form-item class="customer-button">
-              <el-button class="customer-bun-min" type="primary" style="margin-left: 10px; margin-bottom: 5px;">
-                列表</el-button>
-            </el-form-item>
             <el-form-item class="customer-button">
               <el-button class="customer-bun-min" type="primary" @click="refreshPageData" style="margin-left: 10px; margin-bottom: 5px;">
               刷新</el-button>
@@ -31,45 +27,46 @@
               <el-button  class="customer-bun-min" type="primary" @click="closeDialog" style="margin-left: 10px; margin-bottom: 5px;">
               关闭</el-button>
             </el-form-item>
+            <el-button v-if="showDefault" @click="saveMultiLanguage()" type="primary">对语言设置</el-button>
           </el-col>
         </el-row>
         <!--  卷数量统计 班次信息  -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 495px;">
-            <legend>卷数量统计</legend>
+            <legend>{{labels.rollQtySum}}</legend>
             <el-form-item class="customer-item">
               <el-checkbox disabled="disabled" style="margin-top: 15px;" true-label="Y" false-label="N"
-                           v-model="pageData.reportedFlag">是否报告产量</el-checkbox>
+                           v-model="pageData.reportedFlag">{{labels.whetherReport}}</el-checkbox>
             </el-form-item>
-            <el-form-item class="customer-item" label="总良品数量:" style="margin-top: -10px;">
+            <el-form-item class="customer-item" :label=labels.approvedQty style="margin-top: -10px;">
               <!--<el-input v-model="pageData.approvedQty" type="number"  @blur="checkValidApprovedQty"-->
               <el-input v-if="this.preItemNo<=0" v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
               <el-input v-if="this.preItemNo>0"  disabled class="customer-input-color-red"  v-model="pageData.approvedQty" @blur="checkValidApprovedQty" type="number" style="width: 80px;" ></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="总不良品数量:" style="margin-top: -10px;">
+            <el-form-item class="customer-item" :label=labels.defectedQty style="margin-top: -10px;">
               <el-input v-model="pageData.defectedQty" :disabled="showNumFlag" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="总数量" style="margin-top: -10px;">
+            <el-form-item class="customer-item" :label=labels.totalQty style="margin-top: -10px;">
               <el-input v-model="pageData.totalQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="其他卷数量:" style="margin-top: -10px;">
+            <el-form-item class="customer-item" :label=labels.otherRollQty style="margin-top: -10px;">
               <el-input v-model="pageData.otherRollQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
           </fieldset>
           <!-- 操作员信息和班次信息 -->
           <fieldset class="customer-fieldset"
                     style="margin-left: 500px; margin-top: -70px; width: 400px;">
-            <legend>人员排程班次信息</legend>
-            <el-form-item class="customer-item" label="操作员:">
+            <legend>{{labels.operatorScheduleInfo}}</legend>
+            <el-form-item class="customer-item" :label=labels.operatorId>
               <el-input v-model="operatorData.operatorId" disabled="disabled" style="width: 80px;" ></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="操作员姓名:">
+            <el-form-item class="customer-item" :label=labels.operatorName>
               <el-input v-model="operatorData.operatorName" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="排产日期:">
+            <el-form-item class="customer-item" :label=labels.scheduledDate>
               <el-input v-model="pageData.scheduledDate" disabled="disabled" style="width: 80px;" ></el-input>
             </el-form-item>
-            <el-form-item class="customer-item" label="班次:">
+            <el-form-item class="customer-item" :label=labels.shiftNo>
               <el-input v-model="pageData.shiftDesc" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
             </el-form-item>
             <el-button type="info" :disabled="buttonTags.selectShiftFlag" plain @click="selectSchduleShiftModal"
@@ -81,18 +78,18 @@
         </el-form>
         <!-- 卷生产时间统计产量报告 -->
         <el-form style="margin-top: 5px;">
-            <fieldset class="customer-fieldset" style="width: 320px;">
-              <legend>卷生产时间统计</legend>
+            <fieldset class="customer-fieldset" style="width: 320px; margin-top: -10px;">
+              <legend>{{labels.rollTimeSum}}</legend>
               <!-- 调机时间 -->
-              <el-row>
+              <el-row style="margin-top: -10px;">
                 <el-col :span="24">
-                  <el-form-item  label="总调机时间:">
+                  <el-form-item  :label=labels.totalTuningTime >
                     <el-input v-model="pageData.totalSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;" ></el-input>
                   </el-form-item>
-                  <el-form-item  label="总调机过程停机时间:">
+                  <el-form-item  :label=labels.totalTuningDownTime >
                     <el-input v-model="pageData.totalDowntimeTimeSetup" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="净调机时间:" >
+                  <el-form-item  :label=labels.totalPureTuningTime >
                     <el-input v-model="pageData.totalPureSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -100,13 +97,13 @@
               <!-- 生产时间 -->
               <el-row>
                 <el-col :span="24">
-                  <el-form-item  label="总生产时间">
+                  <el-form-item  :label=labels.totalProdTime>
                     <el-input v-model="pageData.totalProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="总生产过程停机时间:">
+                  <el-form-item  :label=labels.totalProdDownTime>
                     <el-input v-model="pageData.totalDowntimeTimeProd" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="净生产时间:" >
+                  <el-form-item  :label=labels.totalPureProdTime >
                     <el-input v-model="pageData.totalPureProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -114,13 +111,13 @@
               <!-- 制造时间 -->
               <el-row>
                 <el-col :span="24">
-                  <el-form-item  label="总制造时间:">
+                  <el-form-item  :label=labels.totalManufTime>
                     <el-input v-model="pageData.totalManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="总制造过程停机时间:">
+                  <el-form-item  :label=labels.totalManufDownTime>
                     <el-input v-model="pageData.totalManufactureDowntimeTime" class="customer-input-color-red" readonly="readonly" style="width: 100px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="净制造时间:" >
+                  <el-form-item  :label=labels.totalPureManufTime>
                     <el-input v-model="pageData.totalPureManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -128,25 +125,25 @@
             </fieldset>
             <!-- 产量报告 -->
             <fieldset class="customer-fieldset"
-                      style="margin-left: 325px; margin-top: -165px; width: 575px;">
+                      style="margin-left: 325px; margin-top: -143px; width: 575px;">
 
-              <legend>产量报告</legend>
+              <legend>{{ labels.produceReport }}</legend>
               <!-- 开工时间 -->
               <el-row>
                 <el-col :span="24">
-                  <el-form-item  label="开工时间">
+                  <el-form-item  :label=labels.startTime>
                     <el-input v-model="pageData.eventTime" disabled="disabled" style="width: 130px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="完工时间">
+                  <el-form-item  :label=labels.finishTime>
                     <el-input v-model="pageData.tillTime" disabled="disabled" style="width: 130px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="生产时间" >
+                  <el-form-item  :label=labels.prodTime >
                     <el-input v-model="pageData.sfdcProdTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="调机时间" >
+                  <el-form-item  :label=labels.tuningTime>
                     <el-input v-model="pageData.sfdcSetupTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="制造时间" >
+                  <el-form-item  :label=labels.manufTime>
                     <el-input v-model="pageData.sfdcManufactureTime" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -154,19 +151,19 @@
               <!-- 合格数量 -->
               <el-row>
                 <el-col :span="24">
-                  <el-form-item  label="合格数量">
+                  <el-form-item  :label=labels.sfdcApprovedQty>
                     <el-input v-model="pageData.sfdcApprovedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="不合格数量">
+                  <el-form-item  :label=labels.sfdcDefectedQty>
                     <el-input v-model="pageData.defectedQty" class="customer-input-color-red" readonly="readonly" style="width: 130px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="报告数量" >
+                  <el-form-item  :label=labels.sfdcReportedQty >
                     <el-input v-model="pageData.sfdcReportedQty" class="customer-input-color-red" readonly="readonly" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="调机停机">
+                  <el-form-item  :label=labels.tuningDown>
                     <el-input v-model="pageData.sfdcSetupDownTime" style="width: 80px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="生产调机" >
+                  <el-form-item  :label=labels.manufTuning >
                     <el-input v-model="pageData.sfdcProdSetupTime" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -174,10 +171,10 @@
               <!-- 备注 -->
               <el-row>
                 <el-col :span="24">
-                  <el-form-item  label="备注">
+                  <el-form-item  :label=labels.remark>
                     <el-input v-model="pageData.remark"  style="width: 430px;"></el-input>
                   </el-form-item>
-                  <el-form-item  label="停机时间">
+                  <el-form-item  :label=labels.downTime>
                     <el-input v-model="pageData.sfdcDownTime" style="width: 80px;"></el-input>
                   </el-form-item>
                 </el-col>
@@ -187,7 +184,7 @@
         <!-- 主材料 -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 830px;">
-            <legend>主材料</legend>
+            <legend>{{labels.primaryMaterial}}</legend>
             <el-table
               height="180"
               :data="sfdcMaterialList"
@@ -261,11 +258,27 @@ import {
     printSfdcLabel,
   } from "@/views/modules/yieldReport/print_roll_label.js";
 
+  import {
+    searchSysLanguagePackList,
+    searchSysLanguageParam,
+    searchFunctionButtonList,
+    saveButtonList,
+    searchSysLanguage,
+    searchLanguageListByLanguageCode,
+    saveSysLanguageOne,
+    searchPageLanguageData,
+    removerLanguage,
+    saveSysLanguageList
+  } from "@/api/sysLanguage.js";
+
+  var functionId = 'C10000005';
+
 export default {
   name: "com_finish_roll",
   data() {
     return {
       titleCon: '结束卷',
+      showDefault: false,
       showExceptionFlag: false,
       showShiftFlag: false,
       showNumFlag:false,
@@ -520,6 +533,321 @@ export default {
         finishRollFlag: true,
       },
       dataListLoading: false,
+      buttons: {
+        refreshButton: '刷新',
+        finishRoll: '结束卷',
+        closeButton: '关闭',
+      },
+      buttonList: [
+        {
+          functionId: functionId,
+          languageValue: '刷新',
+          objectId: 'refreshButton',
+          objectType: 'button',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '结束卷',
+          objectId: 'finishRoll',
+          objectType: 'button',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '关闭',
+          objectId: 'closeButton',
+          objectType: 'button',
+          tableId: '*'
+        },
+      ],
+      queryButton: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'button'
+      },
+      labels: {
+        titleCon: '结束卷操作 ',
+        seqNoName: '派工单号:',
+        currentTime: '当前时间',
+        rollQtySum: '卷数量统计',
+        whetherReport: '是否报告产量',
+        approvedQty: '总良品数量',
+        defectedQty: '总不良品数量',
+        totalQty: '总数量',
+        otherRollQty: '其他卷数量',
+        operatorScheduleInfo: '人员排程班次信息',
+        operatorId: '操作员',
+        operatorName: '操作员姓名',
+        scheduledDate: '排产日期',
+        shiftNo: '班次',
+        rollTimeSum: '卷生产时间统计',
+        totalTuningTime: '总调机时间',
+        totalTuningDownTime: '总调机过程停机时间',
+        totalPureTuningTime: '净调机时间',
+        totalProdTime: '总生产时间',
+        totalProdDownTime: '总生产过程停机时间',
+        totalPureProdTime: '净生产时间',
+        totalManufTime: '总制造时间',
+        totalManufDownTime: '总制造过程停机时间 ',
+        totalPureManufTime: '净制造时间:',
+        produceReport: '产量报告',
+        startTime: '开工时间',
+        finishTime: '完工时间',
+        prodTime: '生产时间',
+        tuningTime: '调机时间',
+        manufTime: '制造时间',
+        sfdcApprovedQty: '合格数量',
+        sfdcDefectedQty: '不合格数量',
+        sfdcReportedQty: '报告数量',
+        tuningDown: '调机停机',
+        manufTuning: '生产调机',
+        remark: '备注',
+        downTime: '停机时间',
+        primaryMaterial: '主材料 ',
+      },
+      labelsList: [
+        {
+          functionId: functionId,
+          languageValue: '结束卷操作 ',
+          objectId: 'titleCon',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '派工单号:',
+          objectId: 'seqNoName',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '当前时间',
+          objectId: 'currentTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '卷数量统计 ',
+          objectId: 'rollQtySum',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '是否报告产量 ',
+          objectId: 'whetherReport',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总良品数量',
+          objectId: 'approvedQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总不良品数量',
+          objectId: 'defectedQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总数量',
+          objectId: 'totalQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '其他卷数量',
+          objectId: 'otherRollQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '人员排程班次信息',
+          objectId: 'operatorScheduleInfo',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '操作员',
+          objectId: 'operatorId',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '操作员姓名',
+          objectId: 'operatorName',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '排产日期',
+          objectId: 'scheduledDate',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '班次',
+          objectId: 'shiftNo',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '卷生产时间统计',
+          objectId: 'rollTimeSum',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总调机时间',
+          objectId: 'totalTuningTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总调机过程停机时间',
+          objectId: 'totalTuningDownTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '净调机时间',
+          objectId: 'totalPureTuningTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总生产时间',
+          objectId: 'totalProdTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总生产过程停机时间',
+          objectId: 'totalProdDownTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '净生产时间',
+          objectId: 'totalPureProdTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总制造时间',
+          objectId: 'totalManufTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '总制造过程停机时间',
+          objectId: 'totalManufDownTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '净制造时间',
+          objectId: 'totalPureManufTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '产量报告',
+          objectId: 'roduceReport',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '开工时间 ',
+          objectId: 'startTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '完工时间:',
+          objectId: 'finishTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '生产时间',
+          objectId: 'prodTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '调机时间',
+          objectId: 'tuningTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '制造时间',
+          objectId: 'manufTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '合格数量',
+          objectId: 'sfdcApprovedQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '不合格数量',
+          objectId: 'sfdcDefectedQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '报告数量',
+          objectId: 'sfdcReportedQty',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '调机停机',
+          objectId: 'tuningDown',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '生产调机 ',
+          objectId: 'manufTuning',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '备注',
+          objectId: 'seqNoName',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '当前时间',
+          objectId: 'remark',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '停机时间',
+          objectId: 'downTime',
+          objectType: 'label',
+          tableId: '*'
+        }, {
+          functionId: functionId,
+          languageValue: '主材料',
+          objectId: 'primaryMaterial',
+          objectType: 'label',
+          tableId: '*'
+        },
+      ],
+      queryLabel: {
+        functionId: functionId,
+        table_id: '*',
+        languageCode: this.$i18n.locale,
+        objectType: 'label'
+      },
     }
   },
   components: {
@@ -561,8 +889,7 @@ export default {
       //初始化操作员对象
       this.operatorData = JSON.parse(JSON.stringify(operatorData));
       //初始化标题
-      this.titleCon = '结束卷操作 \
-       派工单号:'+scheduleData.seqNo;
+      this.titleCon = this.labels.titleCon+this.labels.seqNoName+scheduleData.seqNo;
       //处理异常的原因
       this.pageData.exceptionFlag = 'N';
       this.pageData.exceptionReason =  '';
@@ -935,10 +1262,42 @@ export default {
       });
     },
 
+    /// 保存 默认配置 列
+    async saveMultiLanguage() {
+      // 保存页面 button label title 属性
+      let buttons = this.buttonList;
+      let labels = this.labelsList;
+      await saveButtonList(buttons)
+      await saveButtonList(labels)
+      this.getMultiLanguageList()
+    },
+
+    getMultiLanguageList() {
+      //首先查询当前按钮的多语言
+      searchFunctionButtonList(this.queryButton).then(({data}) => {
+        if (JSON.stringify(data.data) != '{}') {
+          this.buttons = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+      //其次查询当前标签的多语言
+      searchFunctionButtonList(this.queryLabel).then(({data}) => {
+        if (JSON.stringify(data.data) != '{}') {
+          this.labels = data.data
+        } else {
+          // saveButtonList(this.buttonList).then(({data}) => {
+          // })
+        }
+      });
+    },
+
   },
   created() {
     // this.factoryList()
     // this.getLanguageList()
+    this.getMultiLanguageList()//刷新按钮
   }
 }