ocpview-plus 1.1.3 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/datebox/DateBoxV1.vue

@@ -0,0 +1,22 @@
+<script>
+import datebox from "./datebox.vue";
+export default {
+    name: "DateBoxV1",
+    extends: datebox,
+    methods: {},
+    mounted() {
+        const shortcuts = this.$utils.get(this.myConfig, "shortcuts", [
+            {
+                text: "今天",
+                value() {
+                    return new Date();
+                },
+            },
+        ]);
+        this.options.shortcuts = shortcuts;
+    },
+    // beforeUnmount() {
+    //     // console.log("我销毁了");
+    // },
+};
+</script>

package/src/components/datebox/index.js

@@ -1,3 +1,5 @@
-import DateBox from './datebox.vue';
-import DateRangeBox from './daterangebox.vue';
-export {DateBox, DateRangeBox};
+// import DateBox from "./datebox.vue";
+import DateBox from "./DateBoxV1.vue";
+import DateRangeBox from "./daterangebox.vue";
+import DateBoxV1 from "./DateBoxV1.vue";
+export { DateBox, DateRangeBox, DateBoxV1 };

package/src/components/masterplate/leftlistrightdetails.vue

@@ -1,56 +1,66 @@
 <template>
-  <div :style="'background:#fff;overflow: hidden;height:' + clientHeight +'px'">
-    <div ref="head">
-        <Card :padding="0" style="padding-top:14px;padding-left:16px;padding-right:16px;border-radius:0px;" :bordered="false" dis-hover >
-            <ListBtnToolbar ref="menutoolbar" :config="menuToolbar"  :moduleMethod="moduleMethod"   @doAction="doAction"/>
-            <Divider style="margin-top:16px;margin-bottom:0px;" />
-        </Card>
+    <div :style="'background:#fff;overflow: hidden;height:' + clientHeight +'px'">
+        <div ref="head">
+            <Card :padding="0" style="padding-top:14px;padding-left:16px;padding-right:16px;border-radius:0px;"
+                  :bordered="false" dis-hover>
+                <ListBtnToolbar ref="menutoolbar" :config="menuToolbar" :moduleMethod="moduleMethod"
+                                @doAction="doAction"/>
+                <Divider style="margin-top:16px;margin-bottom:0px;"/>
+            </Card>
+        </div>
+        <div class="efuture-demo-split" :style="'height:' + clientHeight2 +'px'">
+            <Split v-model="myConfig.splitNum">
+                <template #left>
+                    <div class="efuture-demo-split-pane" style="padding:14px 16px;">
+                        <Card :padding="0" :bordered="false" dis-hover>
+                            <p style="margin-bottom:10px;">
+                                <span class="efuture-title-verticalline"/> <span
+                                style="font-size: 14px;font-weight:bold" v-text="myConfig.gridtitle"/>
+                            </p>
+                            <div ref="para">
+                                <Input :placeholder="searchPlaceholder" v-model="searchValue" search
+                                       style="width: 98%;margin-top:10xp;margin-bottom:10px" @on-search="search"
+                                       @on-enter="search"/>
+                            </div>
+                            <SimpleViewGrid
+                                ref="grid"
+                                :config="myConfig.gridConfig"
+                                :dictData="dictData"
+                                @rowclick="gridClick"
+                            />
+                        </Card>
+                    </div>
+                </template>
+                <template #right>
+                    <div class="efuture-demo-split-pane" style="padding:14px 0px;">
+                        <Card :padding="0" :bordered="false" dis-hover>
+                            <BillDetailForm ref="form" :config="myConfig.detailConfig" :dictData="dictData"/>
+                        </Card>
+                    </div>
+                </template>
+            </Split>
+        </div>
+        <Modal  title="操作日志" v-model="showBilloperlog" :width="logcurrentWidth" :footer-hide="true">
+            <BillOperLog ref="billoperlog" :config="billOperLogConfig"/>
+        </Modal>
     </div>
-    <div class="efuture-demo-split" :style="'height:' + clientHeight2 +'px'">
-        <Split v-model="myConfig.splitNum">
-            <template #left>
-            <div class="efuture-demo-split-pane" style="padding:14px 16px;">
-                <Card :padding="0" :bordered="false" dis-hover >
-                    <p style="margin-bottom:10px;">
-                       <span class="efuture-title-verticalline"/> <span style="font-size: 14px;font-weight:bold" v-text="myConfig.gridtitle" />
-                    </p>
-                    <div ref="para">
-                      <Input  :placeholder="searchPlaceholder"  v-model="searchValue"  search style="width: 98%;margin-top:10xp;margin-bottom:10px" @on-search="search" @on-enter="search"/>
-                     </div>   
-                    <SimpleViewGrid
-                        ref="grid"
-                        :config="myConfig.gridConfig"
-                        :dictData="dictData"
-                         @rowclick="gridClick"
-                    />
-                </Card>
-            </div>
-            </template>
-            <template #right>
-            <div class="efuture-demo-split-pane" style="padding:14px 0px;">
-                <Card :padding="0" :bordered="false" dis-hover >
-                    <BillDetailForm ref="form" :config="myConfig.detailConfig" :dictData="dictData" />
-                </Card>
-            </div>
-            </template>
-        </Split>
-    </div>
-  </div>
 </template>
 
 <script>
 import ListBtnToolbar from './listbtntoolbar.vue';
 import BillDetailForm from '@/components/masterplate/billdetailform.vue';
 import elementResizeDetectorMaker from 'element-resize-detector';
+import BillOperLog from './operlog.vue';
+
 export default {
     name: 'mleftlistrightdetails',
-    components: { ListBtnToolbar,BillDetailForm },
+    components: {BillOperLog, ListBtnToolbar, BillDetailForm},
     data() {
         return {
             myConfig: {
                 billKey: 'ph_key',
-                gridtitle:'列表',
-                splitNum:0.33,
+                gridtitle: '列表',
+                splitNum: 0.33,
                 resources: '',
                 className: '',
                 gridConfig: {},
@@ -58,13 +68,20 @@ export default {
                 adjustHeight: 160,
                 quickQueryConfig: {}
             },
-            searchPlaceholder:'请输入',
+            searchPlaceholder: '请输入',
             menuToolbar: {
                 enablePermissions: true
             },
             ph_key: '',
-            searchValue:'',
-            headHeight:63,
+            searchValue: '',
+            headHeight: 63,
+            showBilloperlog:false,
+            billOperLogConfig:{
+                showOperLog:false,
+                operLogKey:'billno'
+            },
+            logName:[],
+            logData:null,
         };
     },
     props: {
@@ -84,12 +101,15 @@ export default {
         }
     },
     computed: {
-        clientHeight () {
+        clientHeight() {
             return this.$Store.state.app.clientHeight;
         },
         clientHeight2() {
             return this.$Store.state.app.clientHeight - this.headHeight;
-        }
+        },
+        logcurrentWidth () {
+            return this.$Store.state.app.clientWidth * 0.8;
+        },
     },
     created() {
         this.myConfig = Object.assign({}, this.myConfig, this.config);
@@ -101,7 +121,7 @@ export default {
         this.myConfig.gridConfig.height = 1;
         this.myConfig.gridConfig.adjustHeight = 0;
         this.myConfig.gridConfig.pageShowElevator = false;
-        this.myConfig.gridConfig.pageSize="small";
+        this.myConfig.gridConfig.pageSize = "small";
         this.myConfig.gridConfig.showBorder = true;
         this.myConfig.gridConfig.showStripe = true;
         this.myConfig.gridConfig.generalOrientation = true;
@@ -109,8 +129,8 @@ export default {
             this.myConfig.gridtitle = this.myConfig.gridConfig.title;
         }
 
-        if ( this.myConfig.gridConfig.multiSelect === undefined) {
-             this.myConfig.gridConfig.multiSelect = false;
+        if (this.myConfig.gridConfig.multiSelect === undefined) {
+            this.myConfig.gridConfig.multiSelect = false;
         }
         let searchPlaceholder = '';
         this.myConfig.gridConfig.items.forEach(el => {
@@ -124,14 +144,23 @@ export default {
             }
         });
         if (searchPlaceholder) {
-            searchPlaceholder = searchPlaceholder.substring(0,searchPlaceholder.length - 1);
+            searchPlaceholder = searchPlaceholder.substring(0, searchPlaceholder.length - 1);
             this.searchPlaceholder = this.searchPlaceholder + searchPlaceholder;
         }
-       
+
         // 处理按钮
         if (this.myConfig.menuToolbar && this.myConfig.menuToolbar.items) {
-            this.menuToolbar = this.$Method.copy(this.myConfig.menuToolbar);     
-        } 
+            this.menuToolbar = this.$Method.copy(this.myConfig.menuToolbar);
+        }
+
+        if (this.myConfig.billOperLogConfig) {
+            this.billOperLogConfig = Object.assign({},this.billOperLogConfig, this.myConfig.billOperLogConfig);
+            if (this.billOperLogConfig.showOperLog) {
+                this.menuToolbar.billoperlog = true;
+                this.setLogName();
+            }
+        }
+
         this.myConfig.detailConfig.modetype = '2';
         this.myConfig.detailConfig.billKey = this.myConfig.billKey;
         this.myConfig.detailConfig.showAnchorLink = false;
@@ -140,6 +169,73 @@ export default {
         this.myConfig.detailConfig.resources = this.myConfig.resources;
     },
     methods: {
+        setLogName() {
+            this.logName.push({code:this.myConfig.detailConfig.response,name:'主表'});
+            this.myConfig.detailConfig.formsConfig.items.forEach(el => {
+                this.initLogName(el.items,this.myConfig.detailConfig.response,el.title)
+            });
+            if (this.myConfig.detailConfig.billDetailConfig !== undefined && this.myConfig.detailConfig.billDetailConfig.items) {
+                this.myConfig.detailConfig.billDetailConfig.items.forEach(el => {
+                    if (el.type === 'EditGridCard') {
+                        this.logName.push({code:el.name,name:el.title,isdetail:'1'});
+                        this.initLogName(el.items,el.name,el.title,{isdetail:'1'});
+                    } else if (el.type === 'DetailsBox') {
+                        this.logName.push({code:el.name,name:el.title,isdetail:'1'});
+                        this.initLogName(el.formConfig.items,el.name,el.title,{isdetail:'1'});
+                        this.logName.push({code:el.gridName, name:el.gridConfig.title,isdetail:'2',headtitle:el.title,uniqueKeys:el.uniqueKeys});
+                        this.initLogName(el.gridConfig.items,el.gridName,el.gridConfig.title,{headtitle:el.title,uniqueKeys:el.uniqueKeys,isdetail:'2'});
+                    }
+                });
+            }
+            this.billOperLogConfig.logName = this.$Method.copy(this.logName);
+        },
+        initLogName(list,headname,headtitle,pro) {
+            if (!pro) {
+                pro = {};
+            }
+            list.forEach(el => {
+                if (el.name) {
+                    let obj = {};
+                    obj.title = headtitle;
+                    obj.code = headname+'.' + el.name;
+                    obj.name = el.label;
+                    Object.assign(obj,pro);
+                    this.logName.push(obj);
+                }
+                if (el.textName) {
+                    let obj = {};
+                    obj.title = headtitle;
+                    obj.code = headname +'.' + el.textName;
+                    obj.name = el.label;
+                    Object.assign(obj,pro);
+                    this.logName.push(obj);
+                }
+                if (el.sname) {
+                    let obj = {};
+                    obj.title = el.headtitle;
+                    obj.code = headname +'.' + el.sname;
+                    obj.name = el.label;
+                    Object.assign(obj,pro);
+                    this.logName.push(obj);
+                }
+                if (el.ename) {
+                    let obj = {};
+                    obj.title = el.headtitle;
+                    obj.code = headname + '.' + el.ename;
+                    obj.name = el.label;
+                    Object.assign(obj,pro);
+                    this.logName.push(obj);
+                }
+            });
+        },
+        openBilloperlog() {
+            if (this.logData != null) {
+                this.$refs.billoperlog.setData(this.logData[this.billOperLogConfig.operLogKey],this.logData);
+                this.showBilloperlog = true;
+            } else {
+                this.alert('未产生日志');
+            }
+        },
         search() {
             this.$refs.form.clearData();
             this.$refs.grid.clearSearchBeforeSearchParam();
@@ -151,10 +247,10 @@ export default {
             if (this.searchValue) {
                 para['$or'] = [];
                 this.myConfig.gridConfig.items.forEach(el => {
-                    if(el.condition) {
+                    if (el.condition) {
                         let obj = {};
-                        obj[el.name] = {'LIKE':'%' + this.searchValue + '%'};
-                         para['$or'].push(obj);
+                        obj[el.name] = {'LIKE': '%' + this.searchValue + '%'};
+                        para['$or'].push(obj);
                     }
                 })
             }
@@ -216,8 +312,8 @@ export default {
                 if (data.ph_key) {
                     let data = self.$refs.grid.getData();
                     let culIndex = data.findIndex(
-            el => el[self.myConfig.billKey] === self.ph_key
-          );
+                        el => el[self.myConfig.billKey] === self.ph_key
+                    );
                     if (culIndex > -1) {
                         self.$refs.grid.clearCurrentRow();
                         self.$nextTick(() => {
@@ -246,6 +342,7 @@ export default {
         initForm(para) {
             this.$refs.form.clearData();
             let data = this.getFormData(para);
+            this.logData = this.$Method.copy(data);
             if (this.$parent.setBillData) {
                 data = this.$parent.setBillData(data);
             }
@@ -268,13 +365,13 @@ export default {
                 para.ph_key = this.ph_key;
             }
             self.synchroPost(
-        self.myConfig.resources,
-        self.myConfig.classPrefix + '.get',
-        { ph_key: para.ph_key },
-        function(data) {
-            result = data[self.config.response];
-        }
-      );
+                self.myConfig.resources,
+                self.myConfig.classPrefix + '.get',
+                {ph_key: para.ph_key},
+                function (data) {
+                    result = data[self.config.response];
+                }
+            );
             return result;
         },
         doAction(obj) {
@@ -282,10 +379,11 @@ export default {
             const methodBefore = method + 'Before';
             const methodAfter = method + 'After';
             if (
-        obj.name === 'addData' ||
-        obj.name === 'editData' ||
-        obj.name === 'searchData'
-      ) {
+                obj.name === 'addData' ||
+                obj.name === 'editData' ||
+                obj.name === 'openBilloperlog' ||
+                obj.name === 'searchData'
+            ) {
                 let flag = true;
                 if (this.$parent[methodBefore]) {
                     flag = this.$parent[methodBefore](obj);
@@ -312,12 +410,21 @@ export default {
                         this.checkData(temp);
                     }
 
+                    // '打开日志'
+                    if (obj.name === 'openBilloperlog') {
+                        if (this.$parent.openBilloperlog) {
+                            this.$parent.openBilloperlog();
+                        } else {
+                            this.openBilloperlog();
+                        }
+                    }
+
                     if (this.$parent[methodAfter]) {
                         this.$parent[methodAfter]();
                     }
                 }
             } else {
-                let flag =  true;
+                let flag = true;
                 if (this.$parent[methodBefore]) {
                     flag = this.$parent[methodBefore](obj);
                 }
@@ -338,7 +445,7 @@ export default {
                     let data = this.$refs.form.getChangeData();
                     if (data.flag === 'U') {
                         obj.editFlag = true;
-                    } 
+                    }
                     obj.para = [];
                     obj.para.push(data);
                 }
@@ -437,7 +544,7 @@ export default {
                 }
             }
         },
-        setOutsideHeight () {
+        setOutsideHeight() {
             let height = this.$refs.head.offsetHeight + this.$refs.para.offsetHeight + 80;
             this.$refs.grid.setOutsideHeight(height);
             let height2 = this.$refs.head.offsetHeight;
@@ -446,7 +553,7 @@ export default {
         getChangeData() {
             return this.$refs.form.getChangeData();
         },
-        setDetailVisible(name,value) {
+        setDetailVisible(name, value) {
             this.$refs.form.setVisible(name, value);
         }
     },

package/src/components/masterplate/listbtntoolbar.vue

@@ -1,9 +1,9 @@
 <template>
-   <Row type="flex" :gutter="0" justify="start" align="middle"> 
+   <Row type="flex" :gutter="0" justify="start" align="middle">
     <Col span="18">
-        <Row v-if="!notpowerFlag" type="flex" :gutter="0" justify="start" align="middle"> 
+        <Row v-if="!notpowerFlag" type="flex" :gutter="0" justify="start" align="middle">
             <Col  v-if="addDataBtnFlag">
-                <Button  :custom-icon="mainButtonCustomIcon" :icon="mainButtonIcon"  type="primary" class="mainBtn" :disabled="!!addReadOnly"  @click="addData" >{{myConfig.mainButtonText}}</Button>   
+                <Button  :custom-icon="mainButtonCustomIcon" :icon="mainButtonIcon"  type="primary" class="mainBtn" :disabled="!!addReadOnly"  @click="addData" >{{myConfig.mainButtonText}}</Button>
             </Col>
             <Col v-if="addDataBtnFlag">
                 <Divider  type="vertical" class="dividercommon"/>
@@ -28,12 +28,23 @@
                 </Dropdown>
             </Col>
         </Row>
-        <Row v-else type="flex" :gutter="0" justify="start" align="middle"> 
+        <Row v-else type="flex" :gutter="0" justify="start" align="middle">
               <Icon custom="iconfont icon-custom-tishi"   size="20" color="#F3B352"/> <span style="margin-left: 12px;font-size:18px;color:#F3B352;font-weight:bold">注意：当前页面您没有操作权限</span>
-        </Row>    
+        </Row>
     </Col>
     <Col span="6">
-        <PromptMessages modetype="2"  style="height:100%"/>
+        <Row type="flex" :gutter="0" justify="end" align="middle">
+            <Col v-if="billoperlog">
+                <Button customIcon="iconfont icon-custom-baopidan" @click="openBilloperlog">操作日志</Button>
+            </Col>
+            <Col v-if="billoperlog">
+                <Divider type="vertical" class="dividercommon"/>
+            </Col>
+            <Col>
+                <PromptMessages modetype="2"  style="height:100%"/>
+            </Col>
+        </Row>
+
     </Col>
     </Row>
 </template>
@@ -65,7 +76,8 @@ export default {
             moreFlag:false,
             btnItems:[],
             ignoreModule:['downTemplate'],
-            notpowerFlag:true
+            notpowerFlag:true,
+            billoperlog:false,
         };
     },
     props:{
@@ -76,7 +88,7 @@ export default {
         moduleMethod:{
             type:Array,
             default: () => {
-                return [];      
+                return [];
             }
         },
     },
@@ -122,7 +134,7 @@ export default {
                                 this.mainButtonIcon = el.icon;
                                 this.mainButtonCustomIcon = null;
                             }
-                           
+
                         }
                     });
             }
@@ -144,7 +156,7 @@ export default {
                     }
                     let btnItems = [];
                     this.moduleMethod.forEach(el =>{
-                        let tmp = this.btnItems.find(el2 => el.name === el2.name); 
+                        let tmp = this.btnItems.find(el2 => el.name === el2.name);
                         if (tmp) {
                             btnItems.push(tmp);
                         }
@@ -178,12 +190,19 @@ export default {
             if (this.btnItems.length > this.myConfig.showNum){
                 this.moreFlag = true;
             }
+
+            if (this.myConfig.billoperlog) {
+                this.billoperlog = true;
+            }
         },
         action(name) {
             let obj = {};
             obj.name = name;
             this.$emit('doAction', obj);
         },
+        openBilloperlog() {
+            this.doBtn('openBilloperlog');
+        },
 
         setAllReadOnly (value) {
             let btn = this.$Method.copy(this.btnItems);
@@ -200,14 +219,14 @@ export default {
                             this.addReadOnly = value;
                         } else {
                             this.doCommonPro(el,'readOnly', value);
-                        } 
+                        }
                     });
                 } else {
                     if (obj === this.myConfig.mainButton) {
                         this.addReadOnly = value;
                     } else {
                         this.doCommonPro(obj,'readOnly', value);
-                    } 
+                    }
                 }
             }
         },

package/src/components/upload/billimport.vue

@@ -46,12 +46,12 @@
                     <template #content>
                     <div>{{filename}}</div>
                     </template>
-                </Poptip>
+                </Poptip>   
             </Col>
             <Col>
                  <Upload ref="upload"
                     :before-upload="handleUpload"
-                    accept=".xlsx,.xls"
+                    accept=".xlsx,.xls" 
                     :format="myConfig.fileType"
                     :on-format-error="handleFormatError"
                     :on-success="handleSuccess"
@@ -77,7 +77,7 @@
         </RadioGroup>
     </Modal>
     </template>
-
+      
   </div>
 </template>
 <script>
@@ -168,22 +168,7 @@
                 } else {
                     let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
                     window.open(temp,'_self');
-                }
-            },
-            setExportDownUrl(url,param) {
-                /*if (url) {
-                    url = url.replace('rest', 'exportTemplate');
-                }*/
-                let self = this;
-                this.url = this.getResturl(url,null,{},self);
-                if (this.myConfig.typeData.length > 1) {
-                    this.param = param;
-                    this.type = this.myConfig.typeData[0].code;
-                    this.showUpload = true;
-                } else {
-                    let temp  = this.url +'&param=' +encodeURI(JSON.stringify(param));
-                    window.open(temp,'_self');
-                }
+                } 
             },
             handleUpload (file) {
                 if (!this.checkFormat(file)) {
@@ -229,7 +214,7 @@
                     this.$emit('importSuccess',res);
                 }
                 this.loading = false;
-
+               
             },
             downTemplate() {
                 if (this.type) {
@@ -240,7 +225,7 @@
                         window.open(temp,'_self');
                         this.showUpload = false;
                     }
-
+                    
                 }
             }
         }

package/src/index.js

@@ -20,7 +20,7 @@ import {
 import TextBox from './components/textbox';
 import RichTextBox from './components/richtextbox';
 import { NumberBox, NumberRangeBox,NumberBoxV1 } from './components/numberbox';
-import { DateBox, DateRangeBox } from './components/datebox';
+import { DateBox, DateRangeBox,DateBoxV1 } from './components/datebox';
 import TimePicBox from './components/timebox';
 import PopTextBox from './components/poptextbox';
 import { ControlBox, ControlBase} from './components/base';
@@ -175,7 +175,8 @@ const components = {
    wRichTextBox,
    mBillListDetails,
    NumberBoxV1,
-   mListDetailsV2
+   mListDetailsV2,
+   DateBoxV1
 };
 
 const iview = {