wdy

jiaxiya/app/base/api/impl/transfer/tradeApi.js

@@ -32,22 +32,22 @@ class TradeTransferAPI extends APIBase {
     }
     
     async test(pobj, query){
-        var url = 'http://jaxiya.gongsibao.com/orders/refuse';
+        var url = 'https://jaxiya.gongsibao.com/orders/refuse';
 
         var result = await client.post(url, {
           data:{
-            "BizId":"dd541635415234345",
-            "UserName":"tom",
-            "Mobile":"15900152417",
-            "RegisterNumber":"1525555",
-            "Classification":"02",
-            "Price":"5000"
+            "BizId":"trademark_prepayment_pre-cn-o401er9gv01",
+            "UserName":"阿里云",
+            "Mobile":"18600480430",
+            "RegisterNumber":"25559504",
+            "Classification":"20",
+            "Price":"10"
         },
           headers: {
             accept: 'application/json'
           }
         });
-      
+      return result;
         console.log(JSON.stringify(result));
     }
     exam() {

jiaxiya/app/base/controller/impl/transfer/tradetransferCtl.js

@@ -95,7 +95,7 @@ class TradetransferCtl extends CtlBase {
       gobj.reqbody.FileType = 'PARTNER_SYNC_FILE';
     }
     try {
-      var rst = await self.service.aliclient.reqbyget(gobj);
+      var rst = await self.service.aliclient(gobj);
       console.log(rst)
       var source = {
         OSSAccessKeyId: rst.AccessId,

jiaxiya/app/base/db/metadata/bizs/bizjs/mytradetransferdiliver.js

@@ -3,7 +3,7 @@ module.exports={
     columnMetaData:[
       {"width":"100","label":"买方姓名 ","prop":"user_name","isShowTip":true,"isTmpl":false},
       {"width":"80","label":"注册号","prop":"tm_number","isShowTip":true,"isTmpl":false},
-      {"width":"80","label":"状态","prop":"status_name","isShowTip":true,"isTmpl":false},
+      {"width":"80","label":"状态","prop":"tranfer_status_name","isShowTip":true,"isTmpl":false},
       {"width":"100","label":"买方电话","prop":"mobile","isShowTip":true,"isTmpl":false},
       {"width":"100","label":"尼斯大类","prop":"ncl_one","isShowTip":true,"isTmpl":false},
       {"width":"null","label":"操作","name":"null","isShowTip":false,"isTmpl":true,"isBtns":true},
@@ -24,14 +24,6 @@ module.exports={
          {"type":"input","label":"邮寄单号","prop":"logistics","disabled":false,"placeHolder":"邮寄单号","style":""},
        ]
     },
-    {
-      "title":"办理资料",
-       ctls:[
-        {"type":"upload","label":"商标证","prop":"tm_cert_url","disabled":false,"placeHolder":"","style":""},
-        {"type":"upload","label":"转让证明","prop":"transfer_cert_url","placeHolder":"应用名称","style":""},
-        {"type":"upload","label":"公证书","prop":"notarization_url","disabled":false,"placeHolder":"","style":"width:100px;height:100px"},
-       ]
-    },
   ],
   "search":[
     {

jiaxiya/app/base/service/impl/transfer/tradetransferSve.js

@@ -89,30 +89,30 @@ class TradetransferService extends ServiceBase {
         fq_ordernum: obj.fq_ordernum
       }
       var rtn = await this.create(source);
-      if(rtn){
+      if (rtn) {
         return {
           "status": 0,
           "msg": "success",
           "data": {
             "orderNo": obj.fq_ordernum,
-          "channelServiceNo": obj.BizId,
+            "channelServiceNo": obj.BizId,
             "channelParams": {}
           },
           "requestid": obj.requestid
         }
-      }else{
+      } else {
         return {
           "status": -1,
           "msg": "error",
           "data": {
             "orderNo": obj.fq_ordernum,
-          "channelServiceNo": obj.BizId,
+            "channelServiceNo": obj.BizId,
             "channelParams": {}
           },
           "requestid": obj.requestid
         }
       }
-      
+
     }
   }
   //订单查询
@@ -275,6 +275,8 @@ class TradetransferService extends ServiceBase {
     obj.seller_proxy = obj.seller_proxy == null ? null : obj.seller_proxy.split("com//")[1];
     obj.tm_cert_url = obj.tm_cert_url == null ? null : obj.tm_cert_url.split("com//")[1];
     obj.seller_apply = obj.seller_apply == null ? null : obj.seller_apply.split("com//")[1];
+    obj.transfer_cert_url = obj.transfer_cert_url == null ? null : obj.transfer_cert_url.split("com//")[1];
+    obj.notarization_url= obj.notarization_url == null ? null : obj.notarization_url.split("com//")[1];
     obj.user_type = obj.user_type == "person" ? 2 : 1;
     var sobj = {
       action: "SupplyMaterail",
@@ -295,7 +297,7 @@ class TradetransferService extends ServiceBase {
         SellerProxy: obj.seller_proxy,
         RegistrationCert: obj.tm_cert_url,
         SellerApply: obj.seller_apply,
-        Notarization: obj.notarization
+        Notarization: obj.notarization_url + "," + obj.transfer_cert_url
       }
     }
     console.log(sobj);

jiaxiya/app/front/vues/pages/tansfersupplymaterail/tansfersupplymaterail.html

@@ -77,6 +77,11 @@
                         mtype="test">
                     </gsb-aliupload>
                 </el-form-item>
+                <el-form-item label="转让证明" style="width:600px;">
+                    <gsb-aliupload v-model="supplymaterail.transfer_cert_url" @uploadsuccess="upsuccess"
+                        mtype="test">
+                    </gsb-aliupload>
+                </el-form-item>
                 <el-form-item label="公证书" style="width:600px;">
                     <gsb-aliupload v-model="supplymaterail.notarization_url" @uploadsuccess="upsuccess"
                         mtype="test">

jiaxiya/app/front/vues/pages/tradetransferdiliver/tradetransferdiliver.js

 {
-    template:'${tmpl}',
-    data:function(){
-        return {
-          multipleSelection: [],
-          isSingleSelect:false,
-          bizCode:'mytradetransferdiliver',
-          showUploadform:false,
-          f1:"",
-        }
+  template: '${tmpl}',
+    data: function() {
+      return {
+        multipleSelection: [],
+        isSingleSelect: false,
+        bizCode: 'mytradetransferdiliver',
+        showUploadform: false,
+        f1: "",
+      }
     },
-    mounted:function(){
+  mounted: function() {
 
 
 
+  },
+  created: function() {
+    /* if(this.codePath.indexOf("appuser")>=0){
+       this.bizCode="appuser";
+     }else{
+       this.bizCode="allusers";
+     }*/
+  },
+  methods: {
+    validateformmethod(rule, value, cbk){
+      return cbk();
     },
-    created:function(){
-     /* if(this.codePath.indexOf("appuser")>=0){
-        this.bizCode="appuser";
-      }else{
-        this.bizCode="allusers";
-      }*/
+    onDlgFormClick(k, model){
+      if (k = "submit") {
+        this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
+          if (d.status > -1) {
+            $("[name='grdid']").show();
+            $("[name='frmid']").hide();
+            this.$message({
+              type: 'success',
+              message: '提交成功!'
+            });
+          }
+        })
+      }
     },
-    methods:{
-      validateformmethod(rule,value,cbk){
-        return cbk();
-      },
-      onDlgFormClick(k,model){
-         if(k="submit"){
-           debugger;
-          this.$root.postReq("/web/transfer/tradetransferCtl/submit", model).then(function (d) {
-            debugger;
-            if (d.status > -1) {
-              this.$root.hideMask();
-              this.$message({
-                type: 'success',
-                message: '提交成功!'
-              });
-            }
-          })
-         }
-      },
-       onColFormater(row,column,cellvalue,index){
+    onColFormater(row, column, cellvalue, index){
 
-      
-         return cellvalue;
-       },
-       handleSelectionChange:function(val){
-         this.multipleSelection = val;
-         console.log(val);
-       },
-       fetchData:function(){
 
-       },
-       onRowClick(row,key,e){
-          if(key=="upfiles"){
-            console.log(this.$router);
-            this.$router.push({ path: "/tansfersupplymaterail", query: {ali_bizid:row.ali_bizid} });
-         
-          }
-          if(key=="notar"){
-            console.log(this.$router);
-            this.$router.push({ path: "/mynotarizationflow", query: {ali_bizid:row.ali_bizid} });
-         }
-       },
-       upsuccess(result){
-          console.log(result);
-       }
+      return cellvalue;
+    },
+    handleSelectionChange: function(val) {
+      this.multipleSelection = val;
+      console.log(val);
     },
-    computed: Vuex.mapState({
-      headStyle:function(){
-        return {"background-color":"white"};
+    fetchData: function() {
+
+    },
+    onRowClick(row, key, e){
+      if (key == "upfiles") {
+        console.log(this.$router);
+        this.$router.push({ path: "/tansfersupplymaterail", query: { ali_bizid: row.ali_bizid } });
+
       }
-    }),
-    vname:"gsb-tradetransferdiliver"
+      if (key == "notar") {
+        console.log(this.$router);
+        this.$router.push({ path: "/mynotarizationflow", query: { ali_bizid: row.ali_bizid } });
+      }
+    },
+    upsuccess(result){
+      console.log(result);
+    }
+  },
+  computed: Vuex.mapState({
+    headStyle: function () {
+      return { "background-color": "white" };
+    }
+  }),
+    vname: "gsb-tradetransferdiliver"
 }