ocpview-pro 0.1.6 → 0.1.8

package/src/components/form/formdetailtwo.vue

@@ -2,15 +2,15 @@
     <Card :padding="0">
         <FormCardBox  ref="form" :config="myConfig" :dictData="dictData" >
             <template v-if="btnTypeValue === '1'" #btn>
-            <a   v-if="!editFlag && !readOnly" href="#" @click.prevent="edit">编辑</a> 
-            <a  style="margin-left: 10px;"  v-if="!editFlag && !readOnly"  href="#" @click.prevent="del">删除</a> 
+            <a   v-if="!editFlag && !readOnly" href="#" @click.prevent="edit">{{ $t('编辑') }}</a> 
+            <a  style="margin-left: 10px;"  v-if="!editFlag && !readOnly"  href="#" @click.prevent="del">{{ $t('删除') }}</a> 
             </template>
             <template v-else-if="btnTypeValue === '2'" #btn>
-                <a  href="#" @click.prevent="del">删除</a> 
+                <a  href="#" @click.prevent="del">{{ $t('删除') }}</a> 
             </template>
             <template v-else #btn>
-                <a   v-if="showBtn  && !btnReadOnly" href="#" @click.prevent="editStatic">编辑</a> 
-                <span v-if="showBtn && btnReadOnly" >编辑 </span>
+                <a   v-if="showBtn  && !btnReadOnly" href="#" @click.prevent="editStatic">{{ $t('编辑') }}</a> 
+                <span v-if="showBtn && btnReadOnly" >{{ $t('编辑') }} </span>
             </template>
         </FormCardBox>
         <div  v-if="showChildrenGrid">
@@ -18,8 +18,8 @@
         </div>
         <Row v-if="btnTypeValue === '1' && editFlag" type="flex" justify="center" align="middle" style="margin-top: 10px;margin-bottom: 10px;" :gutter="16">
             <Col>
-                 <Button  type="primary" @click="save">录入完成</Button>
-                 <Button  style="margin-left: 20px;" @click="cancel">放弃</Button>
+                 <Button  type="primary" @click="save">{{ $t('录入完成') }}</Button>
+                 <Button  style="margin-left: 20px;" @click="cancel">{{ $t('放弃') }}</Button>
             </Col>
         </Row>
     </Card>

package/src/components/grid/basegrid.vue

@@ -31,7 +31,7 @@ export default {
                 generalOrientation:false,
                 showSummary:false,
                 showSumGroup:false,
-                sumText:'合计',
+                sumText:this.$t('合计'),
                 pageSizeNum:'',
                 adjustHeight:0,
                 items:[],
@@ -68,7 +68,7 @@ export default {
             delRowAction:[{
                 iconcls: 'row',
                 name: 'delRow',
-                text: '删除',
+                text: this.$t('删除'),
                 type:'text'
             }],
             operFixedFlag:true,
@@ -251,7 +251,7 @@ export default {
             if (this.myConfig.showIndex) {
                  if (this.myConfig.showSumGroup) {
                     let indexConfig = {
-                            label: '行号',
+                            label: this.$t('行号'),
                             name: 'sumindex',
                             type: 'TextBox',
                             align: 'center',
@@ -265,7 +265,7 @@ export default {
                     index.type = 'index';
                     index.key = 'index';
                     index.width = 45;
-                    index.title = '行号';
+                    index.title = this.$t('行号');
                     index.align = 'center';
                     if (this.myConfig.headClassName !== undefined) {
                         index.className  = this.myConfig.headClassName;
@@ -281,7 +281,7 @@ export default {
         initOperColumn(columns) {
             if (this.showRowAction || this.showDelRow) {
                 let action ={};
-                action.title = '操作';
+                action.title = this.$t('操作');
                 if (this.myConfig.headClassName !== undefined) {
                     action.className  = this.myConfig.headClassName;
                 }

package/src/components/grid/editgrid.vue

@@ -28,7 +28,7 @@
         </Card>
     </div>
     </Row>
-    <Modal v-if="!editRowFlag"  v-model="showEditRowForm"  width="90%" title="编辑" @on-ok="editRow">
+    <Modal v-if="!editRowFlag"  v-model="showEditRowForm"  width="90%" :title="$t('编辑')" @on-ok="editRow">
         <div>
            <ExpandRow ref="rowForm"  :config="myConfig" :dictData="dictData"/>
         </div>

package/src/components/grid/editgridbase.vue

@@ -47,6 +47,15 @@ export default {
             focusKey: null,
         };
     },
+    created() {
+        this.myConfig.delBatchBtnName = this.$t('删除');
+        this.myConfig.addBtnName = this.$t('新增');
+        this.myConfig.editBtnName = this.$t('编辑');
+        this.myConfig.cancelBtnName = this.$t('放弃');
+        this.delBatchBtnName = this.$t('删除');
+        this.addBtnName = this.$t('新增');
+        this.rowAction[0].text = this.$t('编辑');
+    },
     computed: {
         colKeys() {
             return this.soltTableColumns.map(c => c.key);
@@ -139,7 +148,7 @@ export default {
                         }
                     }
                     if (data.length === 0) {
-                        this.alert('请选择');
+                        this.alert(this.$t('请选择'));
                     } else {
                         temp.action = 'viewgrid_ok';
                         temp.rows = data;

package/src/components/grid/editgridcard.vue

@@ -67,7 +67,7 @@ export default {
                 iconcls: 'row',
                 icon:'ios-trash',
                 name: 'delRow',
-                text: '删除',
+                text: this.$t('删除'),
                 size:'20',
                 type:'text'
             }],

package/src/components/grid/viewgrid.vue

@@ -17,7 +17,7 @@
                         </Col>
                         <Col v-if="showHelpBtn">
                             <a  href="#" @click.prevent="openHelp">
-                                <Tooltip content="帮助中心" placement="left">
+                                <Tooltip :content="$t('帮助中心')" placement="left">
                                     <CommonIcon   size="32" color="#2d8cf0" type="md-help-circle" />
                                 </Tooltip>
                             </a>
@@ -73,12 +73,12 @@
             </Col>
             <Col span= '2'>
                   <Row  type="flex" justify="center" align="middle" style="padding:5px;" >
-                        <Tooltip content="删除" placement="left">
+                        <Tooltip :content="$t('删除')" placement="left">
                            <Button type="primary" size="small"  icon="ios-arrow-back" :disabled="!rightActive" @click="moveToLeft"></Button>
                         </Tooltip>
                   </Row>
                   <Row  type="flex" justify="center" align="middle" style="padding:5px;" >
-                       <Tooltip content="添加" placement="right">
+                       <Tooltip :content="$t('添加')" placement="right">
                             <Button type="primary" size="small"  icon="ios-arrow-forward" :disabled="!leftActive" @click="moveToRight"></Button>
                         </Tooltip>
                   </Row>

package/src/components/grid/viewgridbase.vue

@@ -24,8 +24,8 @@ export default {
                 headStyle:'padding-bottom: 10px;padding-top: 10px;',
                 multiSelectGrid:false,
                 multiGridCol:11,
-                multiGridTitle:'已选择',
-                gridTitle:'待选择',
+                multiGridTitle:this.$t('已选择'),
+                gridTitle:this.$t('待选择'),
                 highLightRow:true,
                 dynamicColumnFlag:false,
                 dynameicColumnConfig: {
@@ -34,7 +34,7 @@ export default {
                     dynameicColumnValue:'',
                     dynameicColumnValueTitle:'',
                     dynameicColumnValuePro:{},
-                    dynameicColumnSumLable:'动态合计'
+                    dynameicColumnSumLable:this.$t('动态合计')
                 }
             },
             multiGridCol:11,
@@ -137,7 +137,7 @@ export default {
                         }
                     }
                     if (data.length === 0) {
-                        this.alert('请选择');
+                        this.alert(this.$t('请选择'));
                     } else {
                         temp.rows = data;
                         this.$emit('conditionAction',temp);
@@ -455,7 +455,7 @@ export default {
             if (obj.name !== 'addData') {
                 let data = this.getSelection();
                 if (data.length  === 0) {
-                    this.alert('请至少选择一行');
+                    this.alert(this.$t('请至少选择一行'));
                     return;
                 }
                 obj.data= data;
@@ -493,7 +493,7 @@ export default {
         },
         export(asyncExport,afterFun) {
             if(this.data.length == 0){
-                this.alert('请先查询数据');
+                this.alert(this.$t('请先查询数据'));
                 return;
             }
             let _param = this.getSearchParam();
@@ -548,7 +548,7 @@ export default {
                     if (afterFun) {
                         afterFun();
                     } else {
-                        this.alert('文件正在生成，请稍后');
+                        this.alert(this.$t('文件正在生成，请稍后'));
                     }
                 }
             },null);
@@ -705,7 +705,7 @@ export default {
             index.type = 'index';
             index.key = 'index';
             index.width = 45;
-            index.title = '行号';
+            index.title = this.$t('行号');
             index.align = 'center';
             columns.push(index);
         },
@@ -846,7 +846,7 @@ export default {
                 if (this.myConfig.dynameicColumnConfig.dynameicColumnSumLable) {
                     temp.label = this.myConfig.dynameicColumnConfig.dynameicColumnSumLable;
                 } else {
-                    temp.label = '动态合计';
+                    temp.label = this.$t('动态合计');
                 }
                 temp.type='NumberBox';
                 temp.contentAlign = 'right';
@@ -1111,7 +1111,7 @@ export default {
             if (!modulecode) {
                 modulecode = this.$Method.getUrlParam('billmoduleid');
             }
-            let fileName = this.$Method.formatDate(new Date(),'yyyyMMddhhmmss') +'(合计' + this.data.length+'条).xlsx';
+            let fileName = this.$Method.formatDate(new Date(),'yyyyMMddhhmmss') +this.$t('({count}条).xlsx', { count: this.data.length });
             if (modulecode) {
                 fileName = modulecode + '_' + fileName;
             }

package/src/components/map/mapbox.vue

@@ -1,7 +1,7 @@
 <template>
     <div style="height:100%;overflow: auto;">
         <Row  type="flex" justify="end"  align="middle">
-            <Button size="small"  @click="exportMap">打印</Button>
+            <Button size="small"  @click="exportMap">{{ $t('打印') }}</Button>
         </Row>
        <div v-if="reset" ref="divMap" id="map" class="efuture-map" :style="divStyle"></div>
     </div>
@@ -81,7 +81,7 @@ export default {
                 }
                 this.getMapGeojson(map);
             } else {
-                this.alert('楼层未导入平面图，请重新选择');
+                this.alert(this.$t('楼层未导入平面图，请重新选择'));
                 return false;
             }
             return true;

package/src/components/masterplate/RewriteBillListDetails/BillInfoPanelEditTable.vue

@@ -131,7 +131,7 @@
                                     type="text"
                                     :disabled="myConfig.readOnly"
                                     @click="handleAddRow"
-                                    >添加</Button
+                                    >{{ $t('添加') }}</Button
                                 >
                             </Col>
                             <Col v-if="showAddBtn && showDelBatchBtn">
@@ -147,7 +147,7 @@
                                     type="text"
                                     :disabled="myConfig.readOnly"
                                     @click="delBatchRow"
-                                    >删除</Button
+                                    >{{ $t('删除') }}</Button
                                 >
                             </Col>
                         </Row>
@@ -222,7 +222,7 @@
                     style="margin-left: 10px"
                     color="#D5882E"
                 />
-                <span style="margin-left: 4px; color: #d5882e">参考数据</span>
+                <span style="margin-left: 4px; color: #d5882e">{{ $t('参考数据') }}</span>
             </p>
             <Row
                 v-show="showGrid && showEffectValue && showEffectGrid"
@@ -261,7 +261,7 @@
             v-if="!editRowFlag"
             v-model="showEditRowForm"
             width="90%"
-            title="编辑"
+            :title="$t('编辑')"
             @on-ok="editRow"
         >
             <div>
@@ -397,7 +397,7 @@ export default {
                             previous[item.name] = [
                                 {
                                     required: true,
-                                    message: `${item.label ? this.$t(item.label) : item.label}必填`,
+                                    message: (item.label ? this.$t(item.label) : item.label) + this.$t('必填'),
                                 },
                             ];
                         }
@@ -716,7 +716,7 @@ export default {
             return [
                 columns.map((item, index) => {
                     if (index === sumSub) {
-                        return "合计";
+                        return this.$t('合计');
                     }
                     if (this.sumFields.includes(item.field)) {
                         const sumData = this.handleSumField({

package/src/components/masterplate/RewriteBillListDetails/BillInfoPanelEditTableControlbox.vue

@@ -17,11 +17,11 @@
                             class="efuture-hide-text"
                         >
                             <Icon type="ios-arrow-up" />
-                            <span> 收起查询条件 </span>
+                            <span> {{ $t('收起查询条件') }} </span>
                         </p>
                         <p v-else @click.stop="hide" class="efuture-hide-text">
                             <Icon type="ios-arrow-down" />
-                            <span>展开查询条件</span>
+                            <span>{{ $t('展开查询条件') }}</span>
                         </p>
                     </div>
                 </template>

package/src/components/masterplate/RewriteBillListDetails/BillListPanelQueryBar.vue

@@ -21,14 +21,14 @@
                             customIcon="iconfont icon-custom-search"
                             type="primary"
                             @click="search"
-                            >查询</Button
+                            >{{ $t('查询') }}</Button
                         >
                     </Col>
                     <Col>
                         <Button
                             customIcon="iconfont icon-custom-reset"
                             @click="clear"
-                            >重置</Button
+                            >{{ $t('重置') }}</Button
                         >
                     </Col>
                     <Col>
@@ -47,7 +47,7 @@
                                     <Button
                                         customIcon="iconfont icon-custom-filter"
                                         @click="updataFilterScene"
-                                        >高级查询</Button
+                                        >{{ $t('高级查询') }}</Button
                                     >
                                     <Button
                                         v-if="!filterSceneFlag && sceneFlag"
@@ -95,7 +95,7 @@
                                     customIcon="iconfont icon-custom-add"
                                     v-if="addDataBtnFlag"
                                     @click="addData"
-                                    >新增</Button
+                                    >{{ $t('新增') }}</Button
                                 >
                                 <Button
                                     v-if="!btnFlag && moreBtnFlag"
@@ -144,7 +144,14 @@
             :dictData="dictData"
         />
         <!-- 列表快捷查询 -->
-        <div v-show="filterFlag" style="margin-top: 20px">
+        <Modal
+            v-model="filterFlag"
+            :title="$t('高级查询')"
+            :width="90"
+            footer-hide
+            :styles="{ top: '20px' }"
+            @on-cancel="onFilterModalCancel"
+        >
             <BillConditionsBox
                 ref="filter"
                 @doAction="doAction"
@@ -152,7 +159,7 @@
                 :config="config"
                 :dictData="dictData"
             />
-        </div>
+        </Modal>
     </div>
 </template>
 <script>
@@ -246,7 +253,9 @@ export default {
             }
         },
         conditionAction(obj) {
-            // this.filterFlag = false;
+            if (obj.name === 'condition_searchFilter' || obj.name === 'condition_closeFilter') {
+                this.filterFlag = false;
+            }
             let data = this.$refs.filter.getData();
             this.updateScene(data.scenename, data);
             this.$emit("conditionAction", obj);

package/src/components/masterplate/RewriteBillListDetails/BillListPanelTable.vue

@@ -172,7 +172,7 @@
                         align="middle"
                         style="padding: 5px"
                     >
-                        <Tooltip content="删除" placement="left">
+                        <Tooltip :content="$t('删除')" placement="left">
                             <Button
                                 type="primary"
                                 size="small"
@@ -188,7 +188,7 @@
                         align="middle"
                         style="padding: 5px"
                     >
-                        <Tooltip content="添加" placement="right">
+                        <Tooltip :content="$t('添加')" placement="right">
                             <Button
                                 type="primary"
                                 size="small"

package/src/components/masterplate/RewriteBillListDetails/index.vue

@@ -56,7 +56,7 @@
             class-name="efuture-billapprovalmainframe"
             v-model="showApproval"
             fullscreen
-            title="报批单"
+            :title="$t('报批单')"
             footer-hide
         >
             <iframe
@@ -67,7 +67,7 @@
             ></iframe>
         </Modal>
         <Modal
-            title="单据日志"
+            :title="$t('单据日志')"
             v-model="showBilloperlog"
             :width="logcurrentWidth"
             :footer-hide="true"
@@ -242,12 +242,12 @@ export default {
                     let flag = await this.$refs.form.checkValidate();
                     // console.log("saveData:", flag);
                     if (flag) {
-                        this.alert("必填项不允许为空");
+                        this.alert(this.$t('必填项不允许为空'));
                         return false;
                     }
                     flag = this.$refs.form.isEdit();
                     if (flag) {
-                        this.alert("存在数据未确认");
+                        this.alert(this.$t('存在数据未确认'));
                         return false;
                     }
                     obj.para = this.$refs.form.getChangeData();
@@ -292,18 +292,18 @@ export default {
                     obj.name === "cancelData" ||
                     obj.name === "revokeData"
                 ) {
-                    let text = "删除";
+                    let text = this.$t('删除');
                     if (obj.name === "auditData") {
-                        text = "审核";
+                        text = this.$t('审核');
                         obj.para = { billno: data.billno };
                     }
                     if (obj.name === "cancelData") {
-                        text = "作废";
+                        text = this.$t('作废');
                         obj.para = { billno: data.billno };
                     }
 
                     if (obj.name === "revokeData") {
-                        text = "撤回";
+                        text = this.$t('撤回');
                         obj.para = { billno: data.billno };
                     }
                     if (this.$parent.getActionName) {
@@ -312,10 +312,10 @@ export default {
                             text = name;
                         }
                     }
-                    let info = "确定是否" + text + "数据？";
+                    let info = this.$t('确定是否{text}数据？', { text: text });
                     let self = this;
                     self.$Modal.confirm({
-                        title: "确认",
+                        title: this.$t('确认'),
                         content: info,
                         onOk: () => {
                             self.$emit("doAction", obj);

package/src/components/masterplate/RewriteListdetails/BillListPanelV3QueryBar.vue

@@ -19,14 +19,14 @@
                                 customIcon="iconfont icon-custom-search"
                                 type="primary"
                                 @click="search"
-                                >查询</Button
+                                >{{ $t('查询') }}</Button
                             >
                         </Col>
                         <Col>
                             <Button
                                 customIcon="iconfont icon-custom-reset"
                                 @click="clear"
-                                >重置</Button
+                                >{{ $t('重置') }}</Button
                             >
                         </Col>
                         <Col>
@@ -48,7 +48,7 @@
                                         <Button
                                             customIcon="iconfont icon-custom-filter"
                                             @click="updataFilterScene"
-                                            >高级查询</Button
+                                            >{{ $t('高级查询') }}</Button
                                         >
                                         <Button
                                             v-if="!filterSceneFlag && sceneFlag"
@@ -92,7 +92,7 @@
                                         customIcon="iconfont icon-custom-add"
                                         v-if="addDataBtnFlag"
                                         @click="addData"
-                                        >新增</Button
+                                        >{{ $t('新增') }}</Button
                                     >
                                     <Button
                                         v-if="
@@ -143,7 +143,14 @@
                 </Col>
             </Row>
         </Card>
-        <div v-show="filterFlag" style="margin-top: 14px">
+        <Modal
+            v-model="filterFlag"
+            :title="$t('高级查询')"
+            :width="90"
+            footer-hide
+            :styles="{ top: '20px' }"
+            @on-cancel="onFilterModalCancel"
+        >
             <BillConditionsBox
                 ref="filter"
                 @doAction="doAction"
@@ -151,7 +158,7 @@
                 :config="config"
                 :dictData="dictData"
             />
-        </div>
+        </Modal>
     </div>
 </template>
 <script>
@@ -245,7 +252,9 @@ export default {
             }
         },
         conditionAction(obj) {
-            // this.filterFlag = false;
+            if (obj.name === 'condition_searchFilter' || obj.name === 'condition_closeFilter') {
+                this.filterFlag = false;
+            }
             let data = this.$refs.filter.getData();
             this.updateScene(data.scenename, data);
             this.$emit("conditionAction", obj);

package/src/components/masterplate/RewriteListdetails/indexV2.vue

@@ -42,7 +42,7 @@
             class-name="efuture-billapprovalmainframe"
             v-model="showApproval"
             fullscreen
-            title="报批单"
+            :title="$t('报批单')"
             footer-hide
         >
             <iframe
@@ -53,7 +53,7 @@
             ></iframe>
         </Modal>
         <Modal
-            title="单据日志"
+            :title="$t('单据日志')"
             v-model="showBilloperlog"
             :width="logcurrentWidth"
             :footer-hide="true"
@@ -228,12 +228,12 @@ export default {
                 if (obj.name === "saveData") {
                     let flag = this.$refs.form.checkValidate();
                     if (flag) {
-                        this.alert("必填项不允许为空");
+                        this.alert(this.$t("必填项不允许为空"));
                         return false;
                     }
                     flag = this.$refs.form.isEdit();
                     if (flag) {
-                        this.alert("存在数据未确认");
+                        this.alert(this.$t("存在数据未确认"));
                         return false;
                     }
                     obj.para = this.$refs.form.getChangeData();
@@ -278,18 +278,18 @@ export default {
                     obj.name === "cancelData" ||
                     obj.name === "revokeData"
                 ) {
-                    let text = "删除";
+                    let text = this.$t("删除");
                     if (obj.name === "auditData") {
-                        text = "审核";
+                        text = this.$t("审核");
                         obj.para = { billno: data.billno };
                     }
                     if (obj.name === "cancelData") {
-                        text = "作废";
+                        text = this.$t("作废");
                         obj.para = { billno: data.billno };
                     }
 
                     if (obj.name === "revokeData") {
-                        text = "撤回";
+                        text = this.$t("撤回");
                         obj.para = { billno: data.billno };
                     }
                     if (this.$parent.getActionName) {
@@ -298,10 +298,10 @@ export default {
                             text = name;
                         }
                     }
-                    let info = "确定是否" + text + "数据？";
+                    let info = this.$t('确定是否{text}数据？', { text: text });
                     let self = this;
                     self.$Modal.confirm({
-                        title: "确认",
+                        title: this.$t("确认"),
                         content: info,
                         onOk: () => {
                             self.$emit("doAction", obj);