ソースを参照

多语言适配bug修复,表格配置調整

qymljy 1 年間 前
コミット
67dc2db696

+ 1 - 1
src/HDrpManagement/contractManage/components/productList/productBillno.vue

@@ -2,7 +2,7 @@
   <div>
     <div>
       <div class="flex-align-center" style="margin-bottom:10px">
-        <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索111内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
+        <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
         <uploadAllData
             v-if="tool.checkAuth($route.name,'productBillManage') && data.status === '新建' && isLeader"

+ 2 - 2
src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -218,12 +218,12 @@
             <el-input size="mini" readonly :value="$t(scope.column.data.position)" @input="rowChange(scope.column.data,scope.$index)" :placeholder="$t(`输入仓位`)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname === 'batchno'">
-            <el-input size="mini" readonly :value="$t(scope.column.data.batchno)" @input="rowChange(scope.column.data,scope.$index)" :placeholder="$t(`输入批号`)"></el-input>
+            <el-input size="mini" readonly :value="scope.column.data.batchno" @input="rowChange(scope.column.data,scope.$index)" :placeholder="$t(`输入批号`)"></el-input>
           </div>
           <div v-else-if="scope.column.columnname === 'remarks'">
             <el-input v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
           </div>
-          <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
+          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
         <template v-slot:opreation="scope">
           <el-button v-if="data.status == '新建'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">{{$t('删 除')}}</el-button>

+ 4 - 4
src/WebsiteManagement/caseManage/modules/hw_obs_upload.vue

@@ -33,7 +33,7 @@
         size="mini"
         @click="dialogUploadVisible = true"
         :disabled="status === '已结案' || status === '已失败' || disabled"
-        >附件上传</el-button
+        >{{$t(`附件上传`)}}</el-button
       >
     </div>
     <!-- 按钮类型 -->
@@ -46,7 +46,7 @@
       @click="dialogUploadVisible = true"
       icon="el-icon-upload"
       :disabled="status === '已结案' || status === '已失败' || disabled"
-      >上 传</el-button
+      >{{$t(`上 传`)}}</el-button
     >
     <el-dialog
       title="文件上传"
@@ -69,7 +69,7 @@
           action="#"
           multiple>
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+        <div class="el-upload__text">{{$t(`将文件拖到此处,或`)}}<em>{{ }}{{$t(`点击上传`)}}</em></div>
         <div class="el-upload__tip" slot="tip">只能上传jpg/png文件,且不超过500kb</div>
       </el-upload>-->
       <el-upload
@@ -85,7 +85,7 @@
         multiple
       >
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+        <div class="el-upload__text">{{$t(`将文件拖到此处,或`)}}<em>{{ }}{{$t(`点击上传`)}}</em></div>
       </el-upload>
       <div class="progress_panel" v-for="file in filelist" :key="file.uid">
         <img

+ 1 - 1
src/WebsiteManagement/consultManage/modules/add.vue

@@ -79,7 +79,7 @@
             注:建议上传图片大小130x80像素,大小不超过2M,格式为JPG/PNG/jpg/png
           </p>
         </div>
-        <p style="font-size: 14px; margin-top: 10px">附件上传</p>
+        <p style="font-size: 14px; margin-top: 10px">{{$t(`附件上传`)}}</p>
         <div style="margin-top: 10px">
           <attachmentList
             :attinfos="attinfo_attachment"

+ 1 - 1
src/WebsiteManagement/consultManage/modules/detailInfo.vue

@@ -114,7 +114,7 @@
             注:建议上传图片大小130x80像素,大小不超过2M,格式为JPG/PNG
           </p>
         </div>
-        <p style="font-size: 14px; margin-top: 10px">附件上传</p>
+        <p style="font-size: 14px; margin-top: 10px">{{$t(`附件上传`)}}</p>
         <div style="margin-top: 10px">
           <attachmentList
             :attinfos="attinfo_attachment"

+ 1 - 1
src/WebsiteManagement/consultManage/modules/edit.vue

@@ -80,7 +80,7 @@
             注:建议上传图片大小130x80像素,大小不超过2M,格式为JPG/PNG/jpg/png
           </p>
         </div>
-        <p style="font-size: 14px; margin-top: 10px">附件上传</p>
+        <p style="font-size: 14px; margin-top: 10px">{{$t(`附件上传`)}}</p>
         <div style="margin-top: 10px">
           <attachmentList
             :attinfos="attinfo_attachment"

+ 15 - 15
src/components/normal-basic-layout-new/details/modules/followUp/addLog.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-button type="default" size="mini" @click="onShow" :disabled="status === '已结案' || status === '已失败'">{{$t(`新 建`)}}</el-button>
-    <el-drawer title=" 新建跟进动态" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
+    <el-drawer :title="$t(`新建跟进动态`)" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" ref="form" label-position="top" label-width="80px">
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'" label="跟进类型" prop="type" :rules="{ required: true, message: '请选择跟进类型', trigger: 'change'}">
-            <el-select v-model="form.type" placeholder="请选择" style="width: 100%">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
+            <el-select v-model="form.type" :placeholder="$t(`请选择`)" style="width: 100%">
               <el-option
                   v-for="item in followUpType"
                   :key="item.value"
@@ -14,7 +14,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="跟进对象" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" prop="dataextend.contactsid" :rules="{ required: true, message: '请选择跟进对象', trigger: 'change'}">
+          <el-form-item :label="$t(`跟进对象`)" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" prop="dataextend.contactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
             <el-tag
                 style="float: left;margin-right: 5px;margin-bottom: 5px"
                 v-for="tag in selectTag"
@@ -22,24 +22,24 @@
                 closable
                 @close="closeTag(tag)"
                 :type="tag.type">
-              {{tag.name}}
+              {{$t(tag.name)}}
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" :selects="form.dataextend.contactsid"></contactsList>
           </el-form-item>
-          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进动态`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" :placeholder="$t(`请输入跟进目的`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进过程" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进过程`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="结果" prop="results" :rules="{ required: false, message: '请填写跟进结果', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" placeholder="请输入跟进结果" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" :placeholder="$t(`请输入跟进结果`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" :placeholder="$t(`请输入下次跟进计划`)" autocomplete="off"></el-input>
           </el-form-item>
           <el-form-item>
             <upload

+ 15 - 15
src/components/normal-basic-layout-new/details/modules/followUp/editLog.vue

@@ -3,11 +3,11 @@
     <el-button type="text" size="mini" @click="onShow(dialogFormVisible = true)" :disabled="status === '已结案' || status === '已失败'">
       <svg t="1727058404479" class="icon" viewBox="0 0 1024 1024" style="vertical-align: middle" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12347" width="14" height="14"><path d="M319.122286 565.101714a8.265143 8.265143 0 0 0-1.609143 2.852572l-51.2 188.928a32.109714 32.109714 0 0 0 39.277714 39.350857l187.538286-51.2h0.658286a8.118857 8.118857 0 0 0 5.851428-2.413714l501.540572-501.467429a80.457143 80.457143 0 0 0 23.04-57.344 98.011429 98.011429 0 0 0-29.257143-68.681143l-47.396572-47.469714a98.157714 98.157714 0 0 0-68.681143-29.257143 80.457143 80.457143 0 0 0-57.856 23.698286L319.853714 563.712c-0.512 0.512-0.365714 1.170286-0.731428 1.755429m632.685714-373.028572l-49.810286 49.810286-80.969143-81.92 49.078858-49.078857a23.332571 23.332571 0 0 1 31.744 2.267428l47.396571 47.469715a25.819429 25.819429 0 0 1 7.753143 17.993142 19.090286 19.090286 0 0 1-5.412572 13.604572m-543.524571 380.342857l361.764571-361.545143 80.457143 82.066286-360.521143 361.252571z m-65.828571 146.724571l26.185142-95.963428 69.778286 69.778286z m641.170285-328.704a34.742857 34.742857 0 0 0-34.596571 34.669715v467.894857a44.470857 44.470857 0 0 1-44.470857 44.397714H113.590857a44.544 44.544 0 0 1-44.470857-44.397714V130.486857a44.544 44.544 0 0 1 44.470857-44.470857h509.366857a34.596571 34.596571 0 0 0 0-69.193143H108.324571A108.544 108.544 0 0 0-0.073143 125.220571v773.558858a108.544 108.544 0 0 0 108.397714 108.397714h801.353143a108.470857 108.470857 0 0 0 108.397715-108.397714V426.130286a34.669714 34.669714 0 0 0-34.596572-34.450286" fill="#999999" p-id="12348"></path></svg>
       <span style="font-size: 14px;color: #333;margin-left: 5px;vertical-align: middle">{{$t(`编辑`)}}</span></el-button>
-    <el-drawer title="编辑跟进动态" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
+    <el-drawer :title="$t(`编辑跟进动态`)" size="600px" append-to-body :visible.sync="dialogFormVisible" @close="onClose">
       <div class="drawer__panel">
         <el-form ref="form" :model="form" label-position="top" label-width="80px">
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'" label="跟进类型" prop="type" :rules="{ required: true, message: '请选择跟进类型', trigger: 'change'}">
-            <el-select v-model="form.type" placeholder="请选择" style="width: 100%">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'" :label="$t(`跟进类型`)" prop="type" :rules="{ required: true, message: $t('请选择跟进类型'), trigger: 'change'}">
+            <el-select v-model="form.type" :placeholder="$t(`请选择`)" style="width: 100%">
               <el-option
                   v-for="item in followUpType"
                   :key="item.value"
@@ -16,7 +16,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" label="跟进对象" prop="dataextend.contactsid" :rules="{ required: true, message: '请选择跟进对象', trigger: 'change'}">
+          <el-form-item v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail'" :label="$t(`跟进对象`)" prop="dataextend.contactsid" :rules="{ required: true, message: $t('请选择跟进对象'), trigger: 'change'}">
             <el-tag
                 style="float: left;margin-right: 5px;margin-bottom: 5px"
                 v-for="tag in selectTag"
@@ -24,24 +24,24 @@
                 closable
                 @close="closeTag(tag)"
                 :type="tag.type">
-              {{tag.name}}
+              {{$t(tag.name)}}
             </el-tag>
             <contactsList style="float: left" @onSelect="onSelect" ref="listData" :selects="form.dataextend.contactsid" :sys_enterpriseid="sys_enterpriseid"></contactsList>
           </el-form-item>
-          <el-form-item label="跟进动态" prop="content" :rules="{ required: true, message: '请填写跟进动态', trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进动态" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`跟进动态`)" prop="content" :rules="{ required: true, message: $t('请填写跟进动态'), trigger: 'blur'}" v-if="$route.path !== '/projectChangeDetail' && $route.path !== '/customerDetail' && $route.path !== '/PublicCustomerDetail' && $route.path !== '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进动态`)" autocomplete="off"></el-input>
           </el-form-item>
-           <el-form-item label="目的" prop="target" :rules="{ required: false, message: '请填写跟进目的', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" placeholder="请输入跟进目的" autocomplete="off"></el-input>
+           <el-form-item :label="$t(`目的`)" prop="target" :rules="{ required: false, message: $t('请填写跟进目的'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.target" :placeholder="$t(`请输入跟进目的`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="过程" prop="content" :rules="{ required: false, message: '请填写跟进过程', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" placeholder="请输入跟进过程" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`过程`)" prop="content" :rules="{ required: false, message: $t('请填写跟进过程'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.content" :placeholder="$t(`请输入跟进过程`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="结果" prop="results" :rules="{ required: false, message: '请填写跟进结果', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" placeholder="请输入跟进结果" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`结果`)" prop="results" :rules="{ required: false, message: $t('请填写跟进结果'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.results" :placeholder="$t(`请输入跟进结果`)" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="下次跟进计划" prop="nextplan" :rules="{ required: false, message: '请填写下次跟进计划', trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
-            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" placeholder="请输入下次跟进计划" autocomplete="off"></el-input>
+          <el-form-item :label="$t(`下次跟进计划`)" prop="nextplan" :rules="{ required: false, message: $t('请填写下次跟进计划'), trigger: 'blur'}" v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'">
+            <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 18 }" v-model="form.nextplan" :placeholder="$t(`请输入下次跟进计划`)" autocomplete="off"></el-input>
           </el-form-item>
           <div class="flex-align-center flex-between pionter" v-for="file in data.attinfos" :key="file.index">
             <div class="flex-align-center">

+ 4 - 4
src/components/normal-basic-layout-new/details/modules/followUp/followUp.vue

@@ -11,12 +11,12 @@
       </div>
     </div>
     <div style="padding: 0 10px 0 10px">
-      <el-input style="width: 100%" placeholder="搜索" :suffix-icon="search?search.length > 0?'':'':'el-icon-search'" v-model="search" @keyup.native.enter="queryLogs" @clear="queryLogs" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+      <el-input style="width: 100%" :placeholder="$t(`搜索`)" :suffix-icon="search?search.length > 0?'':'':'el-icon-search'" v-model="search" @keyup.native.enter="queryLogs" @clear="queryLogs" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
       </el-input>
     </div>
     <div class="container" style="padding: 10px;!important;">
       <div v-if="logList.length === 0">
-        <el-empty description="暂无记录" :image-size="40"></el-empty>
+        <el-empty :description="$t(`暂无记录`)" :image-size="40"></el-empty>
       </div>
       <el-timeline v-else>
         <el-card v-for="i in logList" :key="i.index" shadow="hover" class="card-style">
@@ -99,7 +99,7 @@
           </div>
           <div style="padding: 10px" v-if="commentShowId == i.sys_datafollowupid">
             <div style="border: 1px solid #9ca3af;padding: 10px;border-radius: 5px">
-              <el-input type="textarea" style="border: none;margin-bottom: 10px" :rows="1" v-model="content" placeholder="我评论:"></el-input>
+              <el-input type="textarea" style="border: none;margin-bottom: 10px" :rows="1" v-model="content" :placeholder="$t(`我评论:`)+':'"></el-input>
               <el-divider></el-divider>
               <div style="display: flex;justify-content: right">
                 <el-button   type="primary" size="small" :disabled="content.length == 0" @click="onComment(i)">{{$t(`发布`)}}</el-button>
@@ -178,7 +178,7 @@
               <marketingExpenses  v-if="$route.path === '/projectChangeDetail' || $route.path === '/customerDetail' || $route.path === '/PublicCustomerDetail' || $route.path === '/phonebookDetail'"  class="inline-16" ownertable="sa_customers" :ownerid="i.sys_datafollowupid" :dataTime="i.createdate" :userid="i.createuserid" @onSuccess="onSuccess"></marketingExpenses>
               <editLog v-if="nowUserid === i.createuserid" :status="status" ref="edits" :data="i" :ownertable="ownertable" @onSuccess="queryLogs"></editLog>
               <el-popconfirm
-                  title="确定删除该跟进动态吗?"
+                  :title="$t(`确定删除该跟进动态吗?`)"
                   @confirm="deleteLogs(i)"
               >
                 <el-button v-if="nowUserid === i.createuserid" slot="reference"  size="mini" type="text" :disabled="status === '已结案' || status === '已失败'">

+ 2 - 2
src/components/normal-basic-layout-new/details/modules/task/addTask.vue

@@ -290,8 +290,8 @@ export default {
 		refresh () {
 			this.form = {
 				"sys_taskid":0,
-        "title":this.$t('任务标题'),
-        "remarks":this.$t('任务说明'),
+        "title":'任务标题',
+        "remarks":'任务说明',
         "starttime":"",
         "remindday":0,
         "ownertable":"",

+ 2 - 2
src/components/normal-basic-layout-new/reportCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true">{{ btnName ? btnName : '导 出' }}</el-button>
+    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
     <el-drawer
     :visible.sync="drawer"
     :with-header="false"
@@ -8,7 +8,7 @@
     size="50%"
     append-to-body>
     <div class="detail__panel container">
-      <p class="normal-title" style="margin-bottom:16px">选择模板</p>
+      <p class="normal-title" style="margin-bottom:16px">{{$t(`选择模板`)}}</p>
       <el-table
         :data="data"
         height="250"

+ 1 - 1
src/components/normal-basic-layout/index.vue

@@ -4,7 +4,7 @@
       <div class="layout-header-panel container normal-panel">
         <div class="flex-align-center flex-between">
           <div class="normal-margin flex-align-center">
-            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{customTitle ? customTitle : activeApp.meta.title}}&nbsp;
+            <div v-if="activeApp" style="font-size:26px;font-weight:300;flex-shrink:0">{{customTitle ? $t(customTitle) : $t(activeApp.meta.title)}}&nbsp;
               <!-- <i v-if="!customTitle" @click="addToAsideBar" style="color:#999" :class="showAppCollection()?'el-icon-star-on collection':'el-icon-star-off'"></i> -->
               <div v-if="!customTitle" style="display:inline">
                 <img width="20" v-if="showAppCollection()" src="@/assets/icons/incoll.svg" alt="">

+ 3 - 3
src/components/normal-basic-layout/reportCenter/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && status === '审核') || $route.name !== 'quotedprice'">{{ btnName ? btnName : '导 出' }}</el-button>
+    <el-button :type="position == 'detail' ? 'primary' : 'text'" :size="size || 'mini'" @click="drawer=true" v-if="($route.name === 'quotedprice' && status === '审核') || $route.name !== 'quotedprice'">{{ btnName ? $t(btnName) : $t('导 出') }}</el-button>
     <el-drawer
     :visible.sync="drawer"
     :with-header="false"
@@ -8,7 +8,7 @@
     size="50%"
     append-to-body>
     <div class="detail__panel container">
-      <p class="normal-title" style="margin-bottom:16px">选择模板</p>
+      <p class="normal-title" style="margin-bottom:16px">{{$t(`选择模板`)}}</p>
       <el-table
         :data="data"
         height="250"
@@ -16,7 +16,7 @@
         style="width: 100%">
         <el-table-column
           prop="name"
-          label="报表名称">
+          :label="$t(`报表名称`)">
         </el-table-column>
         <el-table-column
           prop="operation"

+ 1 - 1
src/components/selectAgent/agent/list.vue

@@ -69,7 +69,7 @@ export default {
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
-      console.log(this.list,'出发啊啊啊');
+      console.log(this.list);
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

+ 4 - 4
src/components/selectMenber/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <el-input v-model="value.name" readonly placeholder="选择对象人员" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="dialogTableVisible = true" :disabled="disabled">
+    <el-input v-model="value.name" readonly :placeholder="$t(`选择对象人员`)" suffix-icon="el-icon-arrow-down" autocomplete="off" @focus="dialogTableVisible = true" :disabled="disabled">
       <template slot="append">
-        <el-button size="small" @click="onClear" style="width:100%" type="primary">清空</el-button>
+        <el-button size="small" @click="onClear" style="width:100%" type="primary">{{$t(`清空`)}}</el-button>
       </template>
     </el-input>
-    <el-dialog title="选择人员" append-to-body :visible.sync="dialogTableVisible" width="80%">
+    <el-dialog :title="$t(`选择人员`)" append-to-body :visible.sync="dialogTableVisible" width="80%">
       <div class="flex">
         <dep-list ref="list" style="width:200px" @onClick="onClick">
         </dep-list>
@@ -13,7 +13,7 @@
           <staffList :depInfo="depInfo" ref="staff">
             <template v-slot:detail="scope">
               <div class="inline-16">
-                <el-button  type="text" size="mini" @click="selectMenber(scope.data)">选 择</el-button>
+                <el-button  type="text" size="mini" @click="selectMenber(scope.data)">{{$t(`选 择`)}}</el-button>
               </div>
             </template>
           </staffList>

+ 1 - 1
src/components/tagPanl/tagPanl.vue

@@ -21,7 +21,7 @@
           :key="item.sys_systemtagdetailid"
           @click="tagClick(item)"
           :style="calcBackgroundColor(item)"
-        >{{item.tag}}</div>
+        >{{$t(item.tag)}}</div>
       </div>
       <div class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">{{$t('取 消')}}</el-button>

+ 6 - 6
src/components/upload/hw_obs_upload.vue

@@ -14,11 +14,11 @@
     </div>
     <!-- 图标类型 -->
     <div v-else-if="btntype === 'icon'" >
-      <el-button icon="el-icon-paperclip" type="text" size="mini" @click="dialogUploadVisible = true" :disabled="status === '已结案' || status === '已失败' || disabled || attachmentDisabled">附件上传</el-button>
+      <el-button icon="el-icon-paperclip" type="text" size="mini" @click="dialogUploadVisible = true" :disabled="status === '已结案' || status === '已失败' || disabled || attachmentDisabled">{{$t(`附件上传`)}}</el-button>
     </div>
     <!-- 按钮类型 -->
-    <el-button v-else :type="status === '已结案' || status === '已失败' || disabled || attachmentDisabled?'':'primary'" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload" :disabled="status === '已结案' || status === '已失败' || disabled || attachmentDisabled ">上 传</el-button>
-    <el-dialog title="文件上传" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :before-close="clearFiles">
+    <el-button v-else :type="status === '已结案' || status === '已失败' || disabled || attachmentDisabled?'':'primary'" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload" :disabled="status === '已结案' || status === '已失败' || disabled || attachmentDisabled ">{{$t(`上 传`)}}</el-button>
+    <el-dialog :title="$t(`文件上传`)" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :before-close="clearFiles">
       <selectMedia v-if = "!hidemediastock" @onShow="onShow" :accept="accept" :bindData="bindData" @onBindSuccess="onBindSuccess"></selectMedia>
       <el-upload
         style="width:100%"
@@ -32,7 +32,7 @@
         drag
         multiple>
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+        <div class="el-upload__text">{{$t(`将文件拖到此处,或`)}}<em>{{ }}{{$t(`点击上传`)}}</em></div>
       </el-upload>
       <div class="progress_panel" v-for="file in filelist" :key="file.uid">
         <img v-if="file.type === 'DOC' || file.type === 'DOCX'" width="30" src="../../assets/file_icons/word.png"
@@ -48,8 +48,8 @@
           alt="">
         <img v-else width="30" src="../../assets/file_icons/unknow.png" alt="">
         <div>
-          <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>上传成功</p>
-          <p>{{file.raw?file.raw.name:'暂无上传文件'}}</p>
+          <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>{{$t(`上传成功`)}}</p>
+          <p>{{file.raw?$t(file.raw.name):$t('暂无上传文件')}}</p>
           <el-progress :percentage="file.progress" :show-text="false"></el-progress>
         </div>
       </div>

+ 6 - 6
src/components/upload/hw_obs_upload_new.vue

@@ -14,11 +14,11 @@
     </div>
     <!-- 图标类型 -->
     <div v-else-if="btntype === 'icon'" >
-      <el-button icon="el-icon-paperclip" type="text" size="mini" @click="dialogUploadVisible = true" :disabled="status === '已结案' || status === '已失败' || disabled">附件上传</el-button>
+      <el-button icon="el-icon-paperclip" type="text" size="mini" @click="dialogUploadVisible = true" :disabled="status === '已结案' || status === '已失败' || disabled">{{$t(`附件上传`)}}</el-button>
     </div>
     <!-- 按钮类型 -->
-    <el-button v-else :type="status === '已结案' || status === '已失败' || disabled?'':'primary'" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload" :disabled="status === '已结案' || status === '已失败' || disabled">上 传</el-button>
-    <el-dialog title="文件上传" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :before-close="clearFiles">
+    <el-button v-else :type="status === '已结案' || status === '已失败' || disabled?'':'primary'" size="small" @click="dialogUploadVisible = true" icon="el-icon-upload" :disabled="status === '已结案' || status === '已失败' || disabled">{{$t(`上 传`)}}</el-button>
+    <el-dialog :title="$t(`文件上传`)" :visible.sync="dialogUploadVisible" width="500px" append-to-body :close-on-click-modal="false" :before-close="clearFiles">
       <selectMedia v-if = "!hidemediastock" @onShow="onShow" :accept="accept" :bindData="bindData" @onBindSuccess="onBindSuccess"></selectMedia>
       <el-upload
         style="width:100%"
@@ -32,7 +32,7 @@
         drag
         multiple>
         <i class="el-icon-upload"></i>
-        <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
+        <div class="el-upload__text">{{$t(`将文件拖到此处,或`)}}<em>{{ }}{{$t(`点击上传`)}}</em></div>
       </el-upload>
       <div class="progress_panel" v-for="file in filelist" :key="file.uid">
         <img v-if="file.type === 'DOC' || file.type === 'DOCX'" width="30" src="../../assets/file_icons/word.png"
@@ -48,8 +48,8 @@
           alt="">
         <img v-else width="30" src="../../assets/file_icons/unknow.png" alt="">
         <div>
-          <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>上传成功</p>
-          <p>{{file.raw?file.raw.name:'暂无上传文件'}}</p>
+          <p v-if="file.progress === 100" style="float:right"><span style="color:#67C23A">●</span>{{$t(`上传成功`)}}</p>
+          <p>{{file.raw?$t(file.raw.name):$t('暂无上传文件')}}</p>
           <el-progress :percentage="file.progress" :show-text="false"></el-progress>
         </div>
       </div>

+ 2 - 2
src/components/uploadAllData/index1.vue

@@ -58,7 +58,7 @@ export default {
     /* 一键选择所有商品 */
     allProduct () {
       if (this.total > this.dataSize) {
-        this.$confirm(`${$t('总共有')}${this.total}${$t('个')}${this.dataType},${$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
+        this.$confirm(`${this.$t('总共有')}${this.total}${this.$t('个')}${this.dataType},${this.$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
           confirmButtonText:this.$t('确定'),
           cancelButtonText:this.$t('取消'),
           type:'warning'
@@ -71,7 +71,7 @@ export default {
           }
         })
       } else {
-        this.$confirm(`${$t('总共有')}${this.total}${$t('个')}${this.dataType},${$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
+        this.$confirm(`${this.$t('总共有')}${this.total}${this.$t('个')}${this.dataType},${this.$t('是否确定')}${this.type == 'upload' ? '提交' : '删除'}`,this.$t('提示'),{
           confirmButtonText:this.$t('确定'),
           cancelButtonText:this.$t('取消'),
           type:'warning'

+ 1 - 1
src/components/uploadBindMediaStock/index.vue

@@ -1,7 +1,7 @@
 <template>
 <div>
   <el-button class="normal-margin" size="small" type="primary" @click="onShow">{{$t('查询媒体库所有数据')}}</el-button>
-  <el-dialog title="媒体库" append-to-body :visible.sync="dialogMediaVisible" width="90%" top="30px">
+  <el-dialog :title="$t(`媒体库`)" append-to-body :visible.sync="dialogMediaVisible" width="90%" top="30px">
     <list ref="list" :accept="accept" @folderChecked="folderChecked" @toFolderDetail="toFolderDetail">
       <!-- <div slot="upload">
         <el-button v-if="clickHistory.length > 1" size="mini" type="text" icon="el-icon-back" @click="backFolder">返回上一级</el-button>

+ 3 - 3
src/components/uploadBindMediaStock/modules/list.vue

@@ -13,7 +13,7 @@
     <div ref="ele" style="height:calc(100vh - 255px);overflow-y:scroll" class="container normal-panel">
       <div class="flex-align-center normal-margin">
         <el-button v-if="fileRouter.length > 1" type="text" size="mini" class="inline-16" @click="toPreFile">{{$t('返回上一级')}}</el-button>
-        <div class="fileRouter__history" v-for="(route,index) in fileRouter" :key="route.index" @click="folderDetails(route,index)">{{route.document}}&nbsp;<span v-show="fileRouter.length - 1 !== index"> > </span>&nbsp;</div>
+        <div class="fileRouter__history" v-for="(route,index) in fileRouter" :key="route.index" @click="folderDetails(route,index)">{{$t(route.document)}}&nbsp;<span v-show="fileRouter.length - 1 !== index"> > </span>&nbsp;</div>
       </div>
       <div class="flex-align-stretch flex-warp">
         <div v-for="(folder) in list" :key="folder.id" class="folder-item" :class="folder.ischeck?'checked':''">
@@ -47,11 +47,11 @@
               <img  src="@/assets/file_icons/unknow.png" alt="">
             </div>
           </div>
-          <p>{{folder.document}}</p>
+          <p>{{$t(folder.document)}}</p>
         </div>
       </div>
       <div v-if="list.length === 0" class="flex-align-center" style="height:calc(100vh - 200px);justify-content:space-around">
-        <el-empty description="暂无文件,请点击左上角的“上传”按钮添加"></el-empty>
+        <el-empty :description="$t(`暂无文件,请点击左上角的“上传”按钮添加`)"></el-empty>
       </div>
     </div>
     <div style="margin:16px 0;text-align:right">