Merge remote-tracking branch 'origin/dev' into dev

src/views/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/view.vue

@@ -69,70 +69,107 @@
                 999666333、888555222、777444111、
               </el-descriptions-item>
             </el-descriptions>
-            <el-form :inline="true" :model="queryParams" class="demo-form-inline" style="margin-top: 20px" label-width="100px">
+            <el-form :inline="true" :model="queryParams" class="demo-form-inline" style="margin-top: 20px" >
               <el-form-item label="一级名称:">
                 <el-select
                     v-model="queryParams.region"
-                    placeholder="请选择"
+                    :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
                     clearable
-                    style="width: 180px;"
+                    style="width: 200px;"
                 >
                   <el-option label="Zone one" value="shanghai" />
                   <el-option label="Zone two" value="beijing" />
                 </el-select>
               </el-form-item>
               <el-form-item label="二级名称:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"
+                />
               </el-form-item>
               <el-form-item label="型号规格:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="生产厂:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="3C证书编号:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="适用车型:">
                 <el-select
                     v-model="queryParams.region"
-                    placeholder="请选择"
+                    :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
                     clearable
-                    style="width: 180px"
+                    style="width: 200px"
                 >
                   <el-option label="Zone one" value="shanghai" />
                   <el-option label="Zone two" value="beijing" />
                 </el-select>
               </el-form-item>
               <el-form-item label="检验文件编号:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="备注:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="零件号:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="专业部门:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="3C认证标志:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="填写状态:">
                 <el-select
                     v-model="queryParams.region"
-                    placeholder="请选择"
+                    :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
                     clearable
-                    style="width: 180px"
+                    style="width: 200px"
                 >
                   <el-option label="Zone one" value="shanghai" />
                   <el-option label="Zone two" value="beijing" />
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-button class="btn-A" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button class="btn-B" icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button class="btn-A" icon="Search" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
+                <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
                 <el-button class="btn-A" @click="singleOpenDialog">选择用户(单选)</el-button>
                 <el-button class="btn-A" @click="openDialog">选择用户(多选)</el-button>
               </el-form-item>
@@ -200,35 +237,71 @@
             </el-descriptions>
             <el-form :inline="true" :model="queryParams" class="demo-form-inline" style="margin-top: 20px">
               <el-form-item label="名称:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="制造/装配/检验的场所:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="责任部门:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="适用车型:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="作业指导书:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="检验作业指导书:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="填写人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="确认人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="校对人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item>
-                <el-button class="btn-A" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button class="btn-B" icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button class="btn-A" icon="Search" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
+                <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
               </el-form-item>
             </el-form>
             <el-table :data="tableData" style="width: 100%" border >
@@ -294,47 +367,87 @@
               <el-form-item label="项目:">
                 <el-select
                     v-model="queryParams.region"
-                    placeholder="请选择"
+                    :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
                     clearable
-                    style="width: 180px;"
+                    style="width: 200px;"
                 >
                   <el-option label="Zone one" value="shanghai" />
                   <el-option label="Zone two" value="beijing" />
                 </el-select>
               </el-form-item>
               <el-form-item label="测量仪器和设备:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="容量:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="频次:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="试验和检查场所:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="所执行的文件名称及编号:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="责任部门:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="适用车型:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="填写人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="确认人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="校对人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item>
-                <el-button class="btn-A" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button class="btn-B" icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button class="btn-A" icon="Search" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
+                <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
               </el-form-item>
             </el-form>
             <el-table :data="tableData" style="width: 100%" border >
@@ -404,41 +517,73 @@
               <el-form-item label="项目:">
                 <el-select
                     v-model="queryParams.region"
-                    placeholder="请选择"
+                    :placeholder="`${cn.pleaseChoose}/${en.pleaseChoose}`"
                     clearable
-                    style="width: 180px;"
+                    style="width: 200px;"
                 >
                   <el-option label="Zone one" value="shanghai" />
                   <el-option label="Zone two" value="beijing" />
                 </el-select>
               </el-form-item>
               <el-form-item label="测量仪器和设备:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="容量:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="频次:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
-              </el-form-item>
-              <el-form-item label="试验和检查场所:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
+              </el-form-item>
+              <el-form-item label="试验和检查的场所:">
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="所执行的文件名称及编号:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="责任部门:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="适用车型:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item label="填写人:">
-                <el-input v-model="queryParams.user" placeholder="请输入" clearable style="width: 180px"/>
+                <el-input
+                  v-model="queryParams.user"
+                  :placeholder="`${cn.pleaseEnter}/${en.pleaseEnter}`"
+                  clearable
+                  style="width: 200px"/>
               </el-form-item>
               <el-form-item>
-                <el-button class="btn-A" icon="Search" @click="handleQuery">搜索</el-button>
-                <el-button class="btn-B" icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button class="btn-A" icon="Search" @click="handleQuery">{{cn.search}}/{{en.search}}</el-button>
+                <el-button class="btn-B" icon="Refresh" @click="resetQuery">{{cn.reset}}/{{en.reset}}</el-button>
               </el-form-item>
             </el-form>
             <el-table :data="tableData" style="width: 100%" border >
@@ -477,6 +622,8 @@
 <script setup>
 import {useRoute} from "vue-router";
 import SelectRole from "@/components/SelectRole/index.vue"
+import cn from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/cn.json';
+import en from '@/locales/controlPlan/CCAPControlPlan/CCAPControlPlanManagement/index/en.json';
 
 const { proxy } = getCurrentInstance();
 import { ref, getCurrentInstance } from 'vue'