暂存

src/components/newLayout/modules/aside.vue

@@ -156,13 +156,7 @@ export default {
   },
   mounted () {
     const link = ()=>{
-      let usertype = JSON.parse(sessionStorage.getItem('active_account')).usertype
-      if (usertype == 1 || usertype == 0){
-        this.$router.push('/serviceDataScreen')
-      }else {
-        this.$router.push({path:app.path})
-      }
-
+      this.$router.push({path:app.path})
     }
     // let active_model = JSON.parse(sessionStorage.getItem('active_modules'))
     // if (sessionStorage.getItem('activeApp')) {

src/components/newLayout/modules/header.vue

@@ -39,7 +39,7 @@
       </el-dropdown-menu>
     </el-dropdown>-->
       <!--    <el-divider direction="vertical"></el-divider>-->
-      <el-button size="mint" type="primary"  style="background-color:rgb(52 106 145);margin-right: 20px;color: #FFFFFF" v-if="usertype == 1 || usertype == 0" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>
+<!--      <el-button size="mint" type="primary"  style="background-color:rgb(52 106 145);margin-right: 20px;color: #FFFFFF" v-if="usertype == 1 || usertype == 0" @click="$router.push('/serviceDataScreen')">{{$t(`业务数据大屏`)}}</el-button>-->
       <svg
         t="1725853431060"
         class="icon"

src/template/addProduct/index.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button size="small" type="primary" @click="onShow" >{{title}}</el-button>
+    <el-button size="small" type="primary" @click="onShow" >{{$t(`title`)}}</el-button>
     <el-drawer
-        title="添加商品"
+        :title="$t(`添加商品`)"
         :visible.sync="dialogFormVisible"
         size="90%"
         direction="rtl"
@@ -18,12 +18,12 @@
               @handleUploadApi="handleUploadApi"
               @onSuccess="onSuccess"
           ></uploadAllData>
-          <el-button :disabled="items.length === 0" :type="items.length > 0?'primary':''" size="small" class="inline-24 bottom-margin" @click="batchAdd">添加选中商品</el-button>
-          <el-input  style="width:200px;" placeholder="商品名称/编码/品号" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="input-with-select inline-24 layout_search__panel bottom-margin" clearable>
+          <el-button :disabled="items.length === 0" :type="items.length > 0?'primary':''" size="small" class="inline-24 bottom-margin" @click="batchAdd">{{$t(`添加选中商品`)}}</el-button>
+          <el-input  style="width:200px;" :placeholder="$t(`商品名称/编码/品号`)" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="input-with-select inline-24 layout_search__panel bottom-margin" clearable>
           </el-input>
-          <el-input  style="width:200px;" placeholder="型号" :suffix-icon="params.content.where.model?params.content.where.model.length > 0?'':'':'el-icon-search'" v-model="params.content.where.model" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="bottom-margin input-with-select inline-24 layout_search__panel" clearable>
+          <el-input  style="width:200px;" :placeholder="$t(`型号`)" :suffix-icon="params.content.where.model?params.content.where.model.length > 0?'':'':'el-icon-search'" v-model="params.content.where.model" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="bottom-margin input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
-          <el-input  style="width:200px;" placeholder="规格" :suffix-icon="params.content.where.spec?params.content.where.spec.length > 0?'':'':'el-icon-search'" v-model="params.content.where.spec" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="bottom-margin input-with-select inline-24 layout_search__panel" clearable>
+          <el-input  style="width:200px;" :placeholder="$t(`规格`)" :suffix-icon="params.content.where.spec?params.content.where.spec.length > 0?'':'':'el-icon-search'" v-model="params.content.where.spec" @keyup.native.enter="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" size="small" class="bottom-margin input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
           <slot name="optionSystem"></slot>
         </div>
@@ -38,7 +38,7 @@
               <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
             <template v-slot:opreation="scope">
-              <el-button type="text" size="mini" @click="addProduct(scope)">添 加</el-button>
+              <el-button type="text" size="mini" @click="addProduct(scope)">{{$t(`添 加`)}}</el-button>
             </template>
           </tableTemp>
           <div  class="container normal-panel" style="text-align:right">