gsb

bpo-admin/app/base/controller/impl/dktemplateCtl.js

@@ -68,7 +68,7 @@ class DKtemplateCtl extends CtlBase {
         fileName: "二维码-" + moment().format("YYYYMMDD") + ".csv",
         fileName: "二维码-" + moment().format("YYYYMMDD") + ".csv",
         rows: page.rows,
         rows: page.rows,
         opts: {
         opts: {
-          fields: ['id', 'dkcompany.name', 'nameA', 'qrcodeurl'],
+          fields: ['id', 'dkcompany.name', 'name', 'codeurl'],
           unwind: ['dkcompany'],
           unwind: ['dkcompany'],
           excelStrings: true,
           excelStrings: true,
           unwindBlank: true
           unwindBlank: true
@@ -76,8 +76,8 @@ class DKtemplateCtl extends CtlBase {
         headers: {
         headers: {
           "id": "编号",
           "id": "编号",
           'dkcompany.name': "公司名",
           'dkcompany.name': "公司名",
-          'nameA': "签约主体",
-          'qrcodeurl': "二维码"
+          'name': "模板名称",
+          'codeurl': "签约地址"
         },
         },
       };
       };
       await this.excelClient.exportCsv(req, res, csvobj);
       await this.excelClient.exportCsv(req, res, csvobj);

bpo-admin/app/front/vues/pages/dktemplateadmin/dktemplateadmin.html

@@ -64,7 +64,7 @@
                 <a v-if="scope.row.dkaggreement && scope.row.dkaggreement.filepath" :href="scope.row.dkaggreement.filepath" target="_blank" style="text-decoration: none;color:#59C1A6;font-size: 14px;">查看</a>
                 <a v-if="scope.row.dkaggreement && scope.row.dkaggreement.filepath" :href="scope.row.dkaggreement.filepath" target="_blank" style="text-decoration: none;color:#59C1A6;font-size: 14px;">查看</a>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column prop="codeurl" label="电子签地址" :formatter="onColFormater" align="center" show-overflow-tooltip></el-table-column>
+            <el-table-column prop="codeurl" label="电子签地址" :formatter="onColFormater" align="center" ></el-table-column>
             <el-table-column prop="updated_at" label="修改日期" :formatter="onColFormater" align="center" ></el-table-column>
             <el-table-column prop="updated_at" label="修改日期" :formatter="onColFormater" align="center" ></el-table-column>
             <el-table-column label="操作" align="center" >  
             <el-table-column label="操作" align="center" >  
               <template slot-scope="scope">
               <template slot-scope="scope">

release-note.txt

@@ -22,24 +22,8 @@
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 5、利用k8s上线镜像为运行容器（这一步后续会实现为自动化）
 
 
 项目版本号段分配
 项目版本号段分配
-0、bigdata  release-v0.x.x
-1、igirl-web   release-v1.x.x
-2、igirl-zcapi release-v2.x.x
-3、igirl-channel-web release-v3.x.x
-4、igirl-channel release-v4.x.x
-5、scratch-web release-v5.x.x
-6、ipself-web release-v6.x.x
-7.  ipop-web release-v7.x.x
-8.  bpo-web  release-v8.x.x
+
 9.  bpo-admin  release-v9.x.x
 9.  bpo-admin  release-v9.x.x
-10. laowubao  release-v10.x.x
-11. xggsve-common  release-v11.x.x
-12. xggsve-merchant  release-v12.x.x
-13. xggsve-order  release-v13.x.x
-14. xggsve-invoice  release-v14.x.x
-15. xggpc  release-v15.x.x
-16. xggadmin  release-v16.x.x
-17. xggweb  release-v17.x.x
 
 
 后续号端请继续补充
 后续号端请继续补充
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】
 查看自己项目号段到达的数字，执行git tag | grep v【号段前缀】