Merge branch 'dev2.0' of http://192.168.3.207:8080/data_processing/data_validation into dev2.0

src/front/remark.go

@@ -51,6 +51,9 @@ func (f *Front) RemarkList() {
 
 func (f *Front) RemarkDetail() {
 	pid := f.GetString("pid")
+	tid := f.GetString("tid")
+	did := f.GetString("did")
+	coll := f.GetString("s_sourceinfo")
 	project, _ := util.Mgo.FindById(util.PROJECTCOLLNAME, pid, `{"v_fields": 1}`)
 	if len(*project) > 0 {
 		field := make(map[string]bool)
@@ -60,12 +63,11 @@ func (f *Front) RemarkDetail() {
 		}
 		f.T["fields"] = field
 	}
-	did := f.GetString("did")
-	coll := f.GetString("s_sourceinfo")
 	qu.Debug(pid, did, coll)
 	rep := getDetail(did, coll)         //获取本条公告的信息
 	f.T["otherInfo"] = rep["otherInfo"] //展示关联公告信息
 	f.T["moreInfo"] = rep["moreInfo"]   //更多关联公告信息
+	f.T["tid"] = tid
 	f.T["info"] = rep["info"]
 	f.T["common"] = rep["common"]
 	f.T["worder"] = rep["worder"]

src/web/templates/project/remark_detail.html

@@ -404,6 +404,11 @@
     var allCheckFields = {{ .T.fields }}          //本次需标注的所有字段
     var moreInfo = {{ .T.moreInfo }}            // 更多关联信息
     var otherInfo = {{ .T.otherInfo }}          //公告关联信息
+
+    let purchasing_status = {{ .T.ck_purchasinglist }}      //标的物标记
+    let purchasing = {{ .T.ck_pclistag }}
+    let package_status = {{ .T.ck_package }}                //包标记
+    let winneroder_status = {{ .T.ck_winnerorder }}         //中标候选人标记
     // 页面数据
     var pageDataMap = {
         '原文': {
@@ -641,7 +646,6 @@
     var packs = {{ .T.packs }}
     var packskey = {{ .T.packskey }}
     var pkg_new = {{ .T.pkg_new }}
-    //var ck_package='{{.T.ck_package}}'
     //分包抽查，若果有分包，默认ok
     //if(packs.length>0&&ispackage=="1"){
     //	ck_package="1"
@@ -751,63 +755,65 @@
             pageHtml: '{{ .T.info.detail }}',
             showPop: false,
             editData:[{
-              title: '基本字段',
-              show: true,
-              status: "1",
-              content: [{
-                title: '',
-                show: true,
-                delete: false,
-                //wstatus:"-1",
-                uInput: uInput
-                //content: c_content
-                }]
-              }, {
-              title: '时间地点',
-              show: false,
-              status: "1",
-              content: [{
-                title: '',
+                title: '基本字段',
                 show: true,
-                delete: false,
-                //wstatus:"-1",
-                uInput: tpInput
-                }]
-              }, {
-              title: '标的信息',
-              show: false,
-              showCheck: true,
-              key: 'purchasinglist',
-              //checkType: {{.T.ck_pclisext}},
-              content: pcl_content,
-              checkAllTag: {{ .T.ck_pclistag }},
-              status: {{ .T.ck_purchasinglist }},
-              }, {
-              title: '多包信息',
-              show:false,
-              showCheck: true,
-              key: 'package',
-              // checkType: {{.T.ck_pkgisext}},
-              status:{{ .T.ck_package }},
-              content: p_content
-              }, {
-              title: '中标候选人信息',
-              show: false,
-              showCheck: true,
-              key: 'winnerorder',
-              // checkType: {{.T.ck_wodrisext}},
-              status:{{ .T.ck_winnerorder }},
-              content: c_content
-              }, {
-              title: '其余信息',
-              show:false,
-              status:"1",
-              content:[{title: '', show: true, delete: false,
+                status: "1",
+                content: [{
+                    title: '',
+                    show: true,
+                    delete: false,
                     //wstatus:"-1",
-                      uInput: otherInput
-                  }
-              ]}
-            ],
+                    uInput: uInput
+                    //content: c_content
+                    }]
+                }, {
+                title: '时间地点',
+                show: false,
+                status: "1",
+                content: [{
+                    title: '',
+                    show: true,
+                    delete: false,
+                    //wstatus:"-1",
+                    uInput: tpInput
+                    }]
+                }, {
+                title: '标的信息',
+                show: false,
+                showCheck: true,
+                key: 'purchasinglist',
+                //checkType: {{.T.ck_pclisext}},
+                checkAllTag: {{ .T.ck_pclistag }},
+                status: purchasing_status,
+                content: pcl_content
+                }, {
+                title: '多包信息',
+                show:false,
+                showCheck: true,
+                key: 'package',
+                // checkType: {{.T.ck_pkgisext}},
+                status: package_status,
+                content: p_content
+                }, {
+                title: '中标候选人信息',
+                show: false,
+                showCheck: true,
+                key: 'winnerorder',
+                // checkType: {{.T.ck_wodrisext}},
+                status: winneroder_status,
+                content: c_content
+                }, {
+                title: '其余信息',
+                show:false,
+                status:"1",
+                content:[{
+                    title: '',
+                    show: true,
+                    delete: false,
+                    //wstatus:"-1",
+                    uInput: otherInput
+                  }]
+                }],
             originData: []},
         watch: {
           //切换标签时更改正文内容
@@ -907,10 +913,9 @@
                       alert("请先保存数据！")
                   } else {
                       if (nextid === "") {
-
+                          showMsg("数据已经全部标注完")
                       } else {
-                          // window.location.href = "/front/user/remark/detail?pid=" + pid + "&did=" + pid + ""
-                          // '+pid+'&did=' + row._id + '&s_sourceinfo='+sourceinfo+'
+                          window.location.href = "/front/user/remark/detail?pid=" + {{ .T.pid }} + "&did=" + nextid + "&s_sourceinfo=" + {{ .T.s_sourceinfo }}
                       }
                   }
               },

src/web/templates/project/remark_list.html

@@ -96,7 +96,7 @@
                         if (row["re_data"] === 1) {
                             tmp = '<a style="display: inline-block;cursor:pointer;font-size:16px;color: green" target="_blank" href="/front/user/remark/detail/?pid='+pid+'&did=' + row._id + '&s_sourceinfo='+sourceinfo+'">' + val + '</a>'
                         } else {
-                            tmp = '<a style="display: inline-block;cursor:pointer;font-size:16px;color: #428bca" target="_blank" href="/front/user/remark/detail/?pid='+pid+'&did=' + row._id + '&s_sourceinfo='+sourceinfo+'">' + val + '</a>'
+                            tmp = '<a style="display: inline-block;cursor:pointer;font-size:16px;color: #428bca" target="_blank" href="/front/user/remark/detail/?pid='+pid+'&tid=' + tid +'&did=' + row._id + '&s_sourceinfo='+sourceinfo+'">' + val + '</a>'
                         }
                         return tmp
                     }}