Browse Source

多语言修改

wumingxin 10 months ago
parent
commit
81a75fd9f0

+ 1 - 1
src/views/componentsDVP/dvpPlan/editModal/editDvp.vue

@@ -119,7 +119,7 @@
           <!--计划结束时间-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
             <a-form-item :label="$t('plan.dvp.scheduled-end-time')">
-               <a-date-picker v-model="editParam.planEndTime" :disabled-date="disabledEndDate" @change="handleEditEndTime" :placeholder="$t('global-btn.please-enter') + $t('workbench.dvp-plan-completion-time')"  allowClear valueFormat="YYYY/MM/DD" style="width: 100%" />
+               <a-date-picker v-model="editParam.planEndTime" :disabled-date="disabledEndDate" @change="handleEditEndTime" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.scheduled-end-time')"  allowClear valueFormat="YYYY/MM/DD" style="width: 100%" />
             </a-form-item>
           </a-col>
         </span>

+ 1 - 1
src/views/componentsDVP/dvpPlan/editModal/editTableRow.vue

@@ -121,7 +121,7 @@
           <!--计划结束时间-->
           <a-col :lg="16" :md="24" :sm="24" :xl="12" :xs="24">
             <a-form-item :label="$t('plan.dvp.scheduled-end-time')">
-               <a-date-picker v-model="editParam.planEndTime" :disabled-date="disabledEndDate" @change="handleEditEndTime" allowClear valueFormat="YYYY/MM/DD" style="width: 100%" :placeholder="$t('global-btn.please-enter') + $t('workbench.dvp-plan-completion-time')"/>
+               <a-date-picker v-model="editParam.planEndTime" :disabled-date="disabledEndDate" @change="handleEditEndTime" allowClear valueFormat="YYYY/MM/DD" style="width: 100%" :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.scheduled-end-time')"/>
             </a-form-item>
           </a-col>
         </span>

+ 1 - 1
src/views/componentsDVP/dvpPlan/editModal/uploadMaterialList.vue

@@ -11,7 +11,7 @@
         <!--材料清单编号-->
         <a-col :lg="24" :md="24" :sm="24" :xl="24" :xs="24">
           <a-form-item :label="$t('plan.dvp.material-number')" :required="true">
-            <a-input v-model.trim="uploadParam.materialNo" :maxLength='128' :placeholder="$t('global-btn.please-select') + $t('plan.dvp.material-number')" allowClear></a-input>
+            <a-input v-model.trim="uploadParam.materialNo" :maxLength='128' :placeholder="$t('global-btn.please-enter') + $t('plan.dvp.material-number')" allowClear></a-input>
           </a-form-item>
         </a-col>
         <!--上传材料清单 -->

+ 7 - 2
src/views/componentsDVP/verify/dvpVerify.vue

@@ -234,7 +234,8 @@
             <a-form-item :label="$t('verity.dvp.is.pass')">
               <a-select
                 v-model="editParam.isPass"
-                :placeholder="$t('global-btn.please-select') + $t('verity.dvp.is.pass')">
+                :placeholder="$t('global-btn.please-select') + $t('verity.dvp.is.pass')"
+                allowClear>
                 <a-select-option value="1">{{ $t('global-btn.yes') }}</a-select-option>
                 <a-select-option value="0">{{ $t('global-btn.no') }}</a-select-option>
               </a-select>
@@ -360,6 +361,7 @@ export default {
         testEndTime: undefined,         // 试验结束时间
         testResult: undefined,          // 试验结果
         testReportCode: undefined,      // 试验报告编号
+        isPass: undefined               // 是否通过
       },
       /** 分页实体 */
       pagination: {
@@ -462,7 +464,10 @@ export default {
           dataIndex: 'isPass',
           ellipsis: true,
           customRender: val => {
-            return val === '0' ? "N" : "Y";
+            if( val == 0 ) {
+              return "N"
+            } else if ( val == 1)
+              return "Y"
           }
         },
         {