ocpview-plus 1.1.7 → 1.1.9

package/package.json

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

package/src/components/masterplate/approval.vue

@@ -159,8 +159,8 @@
                             </Row>
                         </Col>
                     </Row>
-                    <Row type="flex" justify="start" align="middle"  style="height:42px;border:1px solid #DCDFE6">
-                        <Tag  v-for="(item,index) in copy"  :key="'tag2_' + index" :name="item.userCode" style="margin-left:8px"> {{item.userName}}</Tag>
+                    <Row type="flex" justify="start" align="middle" style="height:42px;border:1px solid #DCDFE6">
+                        <Tag v-for="(item,index) in copy" :key="'tag2_' + index" :name="item.userCode" style="margin-left:8px" closable @on-close="closeCommon(item.userCode,'copy')"> {{item.userName}}</Tag>
                     </Row>
                 </FormItem>
                  <FormItem v-show="false" label="审批:">
@@ -435,7 +435,7 @@ export default {
             if (this.copy.length > 0) {
                 let cc = [];
                 this.copy.forEach(el => {
-                    cc.push(el.usercode);
+                    cc.push(el.userCode);
                 });
                 param.cc = cc;
             }
@@ -444,22 +444,18 @@ export default {
             let param = {
                 billno: this.value.billno
             };
-            this.doCc();
+            this.doCc(param);
             if (this.idea) {
                 param.comment = this.idea;
             }
-            this.doPost(
-        '.billsubmit',
-        param,
-        (data) => {
-            this.showDrawer = false;
-            this.$nextTick(() =>{
-                setTimeout(() => {
-                    this.alert(data.msg,null,3);
-                }, 250);
+            this.doPost('.billsubmit', param, (data) => {
+                this.showDrawer = false;
+                this.$nextTick(() =>{
+                    setTimeout(() => {
+                        this.alert(data.msg,null,3);
+                    }, 250);
+                });
             });
-        }
-        );
         },
         submitApprove() {
             this.doPost(    
@@ -564,9 +560,15 @@ export default {
             }
             let para = {};
             para.searchValue = this.searchValue;
-            para.status= [0,1];
+            para.status= 1;
             para.page_size = 999;
             this.userdata = [];
+            para.shopStatus = 1;
+            para.usertype = '01';
+            let portalMkt = this.getPortalMkt();
+            if(portalMkt && portalMkt.shopCode) {
+                para.shopCode = this.getPortalMkt().shopCode;
+            }
             let self = this;
             this.asyncPost(this.OmdUrl.amp, 'usercenter.account.search', para, function (data) {
                 if (data.account) {