no message

exportData/config.json

@@ -0,0 +1,39 @@
+{
+  "mgoAddr": "192.168.3.166:27082",
+  "mgoDbName": "shanghaitf",
+  "mgoColl": "20220316Shdx_zhong_3_2_qx",
+  "mgoSize": 10,
+  "exportType": 2,
+  "isMark": 1,
+  "search": {},
+  "fieldsSort": ["matchkey", "area", "city", "title", "subtype", "detail", "publishtime", "href", "jybxhref", "projectname",
+    "projectcode", "projectscope", "budget", "bidamount", "bidopentime", "buyer", "buyerperson", "buyertel", "agency", "s_winner",
+    "winnerperson", "winnertel", "company_phone", "company_email", "id"],
+  "fields": {
+    "matchkey": "信息匹配词",
+    "area": "省份",
+    "city": "城市",
+    "title": "公告标题",
+    "subtype": "公告类别",
+    "detail": "公告内容",
+    "publishtime": "发布时间",
+    "href": "公告地址",
+    "jybxhref": "剑鱼标讯地址",
+    "projectname": "项目名称",
+    "projectcode": "项目编号",
+    "projectscope": "项目范围",
+    "budget": "预算（元)",
+    "bidamount": "中标金额（元）",
+    "bidopentime": "开标日期",
+    "buyer": "采购单位",
+    "buyerperson": "采购单位联系人",
+    "buyertel": "采购单位联系电话",
+    "agency": "招标代理机构",
+    "s_winner": "中标单位",
+    "winnerperson": "中标单位联系人",
+    "winnertel": "中标单位联系电话",
+    "company_phone": "中标企业联系电话",
+    "company_email": "中标企业电子邮箱",
+    "id": "唯一标识"
+  }
+}

exportData/main.go

@@ -0,0 +1,260 @@
+package main
+
+import (
+	"fmt"
+	"github.com/shopspring/decimal"
+	"github.com/tealeg/xlsx"
+	"mongodb"
+	"qfw/util"
+	"strings"
+)
+
+var (
+	Sysconfig          map[string]interface{}
+	Mgo                *mongodb.MongodbSim
+	Dbname, DbColl     string
+	ExportType, IsMark int
+	Search             map[string]interface{}
+	Fields             map[string]interface{}
+	FieldsArr          []string
+	SE                 = util.SimpleEncrypt{Key: "topJYBX2019"}
+)
+
+func init() {
+	util.ReadConfig(&Sysconfig)
+	Mgo = &mongodb.MongodbSim{
+		MongodbAddr: Sysconfig["mgoAddr"].(string),
+		Size:        util.IntAllDef(Sysconfig["mgoSize"], 5),
+		DbName:      Sysconfig["mgoDbName"].(string),
+	}
+	Mgo.InitPool()
+	Dbname = Sysconfig["mgoDbName"].(string)
+	DbColl = Sysconfig["mgoColl"].(string)
+
+	ExportType = util.IntAll(Sysconfig["exportType"])
+	IsMark = util.IntAll(Sysconfig["isMark"])
+	Search = Sysconfig["search"].(map[string]interface{})
+	FieldsArr = util.ObjArrToStringArr(Sysconfig["fieldsSort"].([]interface{}))
+	Fields = Sysconfig["fields"].(map[string]interface{})
+
+	if ExportType == 1 {
+		FieldsArr[len(FieldsArr)-1] = "itemname"
+		FieldsArr = append(FieldsArr, "brandname", "model", "unitname", "unitprice", "number", "totalprice", "id")
+		Fields["itemname"] = "产品名称"
+		Fields["brandname"] = "品牌"
+		Fields["model"] = "规格型号"
+		Fields["unitname"] = "单位"
+		Fields["unitprice"] = "单价"
+		Fields["number"] = "数量"
+		Fields["totalprice"] = "小计"
+	}
+	util.Debug(FieldsArr)
+}
+
+func main() {
+
+	sess := Mgo.GetMgoConn()
+	defer Mgo.DestoryMongoConn(sess)
+
+	file := xlsx.NewFile()
+	sheet, err := file.AddSheet("sheet1")
+	if err != nil {
+		panic(err)
+	}
+	row := sheet.AddRow()
+	for _, v := range FieldsArr {
+		row.AddCell().SetValue(Fields[v])
+	}
+
+	q := map[string]interface{}{}
+	if len(Search) > 0 {
+		q = Search
+	}
+	c := Mgo.Count(DbColl, q)
+	util.Debug("search size result ---", DbColl, q, c)
+	if c == 0 {
+		return
+	}
+	query := sess.DB(Dbname).C(DbColl).Find(&q).Select(nil).Iter()
+	count := 0
+	for tmp := make(map[string]interface{}); query.Next(&tmp); count++ {
+		if count%500 == 0 {
+			util.Debug("current ---", count)
+		}
+		baseInfo := tmp["v_baseinfo"].(map[string]interface{})
+		tagInfo := tmp["v_taginfo"].(map[string]interface{})
+
+		if ExportType == 0 {
+			row := sheet.AddRow()
+			for _, v := range FieldsArr {
+				if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+					v == "signaturedate" || v == "comeintime" || v == "createtime" {
+					str := ""
+					if baseInfo[v] != nil {
+						date := util.Int64All(baseInfo[v])
+						str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+					}
+					row.AddCell().SetValue(str)
+				} else if v == "id" {
+					id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+					row.AddCell().SetValue(id)
+				} else {
+					row.AddCell().SetValue(baseInfo[v])
+				}
+			}
+		} else if ExportType == 1 {
+			// 拆分标的物
+			if IsMark == 1 {
+				if tagInfo["purchasinglist"] != nil {
+					if baseInfo["purchasinglist"] != nil {
+						plist := baseInfo["purchasinglist"].([]interface{})
+						for _, p := range plist {
+							row := sheet.AddRow()
+							p1 := p.(map[string]interface{})
+							for _, v := range FieldsArr {
+								if v == "itemname" || v == "brandname" || v == "model" || v == "unitname" || v == "unitprice" || v == "number" {
+									row.AddCell().SetValue(p1[v])
+								} else if v == "totalprice" {
+									if p1["totalprice"] != nil {
+										row.AddCell().SetValue(p1[v])
+									} else {
+										if p1["unitprice"] != nil && p1["number"] != nil {
+											d1 := decimal.NewFromFloat(util.Float64All(p1["unitprice"])).Mul(decimal.NewFromInt(int64(util.IntAll(p1["number"]))))
+											row.AddCell().SetValue(d1)
+										} else {
+											row.AddCell().SetValue("")
+										}
+									}
+								} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+									v == "signaturedate" || v == "comeintime" || v == "createtime" {
+									str := ""
+									if baseInfo[v] != nil {
+										date := util.Int64All(baseInfo[v])
+										str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+									}
+									row.AddCell().SetValue(str)
+								} else if v == "id" {
+									id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+									row.AddCell().SetValue(id)
+								} else {
+									row.AddCell().SetValue(baseInfo[v])
+								}
+							}
+						}
+					} else {
+						row := sheet.AddRow()
+						for _, v := range FieldsArr {
+							if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+								v == "signaturedate" || v == "comeintime" || v == "createtime" {
+								str := ""
+								if baseInfo[v] != nil {
+									date := util.Int64All(baseInfo[v])
+									str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+								}
+								row.AddCell().SetValue(str)
+							} else if v == "id" {
+								id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+								row.AddCell().SetValue(id)
+							} else {
+								row.AddCell().SetValue(baseInfo[v])
+							}
+						}
+					}
+				} else {
+					row := sheet.AddRow()
+					for _, v := range FieldsArr {
+						if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+							v == "signaturedate" || v == "comeintime" || v == "createtime" {
+							str := ""
+							if baseInfo[v] != nil {
+								date := util.Int64All(baseInfo[v])
+								str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+							}
+							row.AddCell().SetValue(str)
+						} else if v == "id" {
+							id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+							row.AddCell().SetValue(id)
+						} else {
+							row.AddCell().SetValue(baseInfo[v])
+						}
+					}
+				}
+			} else {
+				util.Debug("是否标注isMark字段值有问题～", IsMark)
+				break
+			}
+		} else if ExportType == 2 {
+			//if IsMark == 1 {
+			//}
+			if baseInfo["package"] != nil {
+				pkg := baseInfo["package"].(map[string]interface{})
+				for _, p := range pkg {
+					row := sheet.AddRow()
+					p1 := p.(map[string]interface{})
+					winner := []string{}
+					bidamount := float64(0)
+					if p1["winner_all"] != nil {
+						if all := p1["winner_all"].([]interface{}); all != nil {
+							if len(all) > 0 {
+								for _, a := range all {
+									a1 := a.(map[string]interface{})
+									if util.ObjToString(a1["winner"]) != "" {
+										winner = append(winner, util.ObjToString(a1["winner"]))
+									}
+									bidamount += util.Float64All(a1["bidamount"])
+								}
+							}
+						}
+					}
+					for _, v := range FieldsArr {
+						if v == "s_winner" && len(winner) > 0 {
+							row.AddCell().SetValue(strings.Join(winner, ","))
+						} else if v == "bidamount" && bidamount != 0 {
+							row.AddCell().SetValue(bidamount)
+						} else if v == "winnerperson" || v == "winnertel" {
+							row.AddCell().SetValue("")
+						} else if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+							v == "signaturedate" || v == "comeintime" || v == "createtime" {
+							str := ""
+							if baseInfo[v] != nil {
+								date := util.Int64All(baseInfo[v])
+								str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+							}
+							row.AddCell().SetValue(str)
+						} else if v == "id" {
+							id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+							row.AddCell().SetValue(id)
+						} else {
+							row.AddCell().SetValue(baseInfo[v])
+						}
+					}
+				}
+			} else {
+				row := sheet.AddRow()
+				for _, v := range FieldsArr {
+					if v == "publishtime" || v == "bidopentime" || v == "project_startdate" || v == "project_completedate" ||
+						v == "signaturedate" || v == "comeintime" || v == "createtime" {
+						str := ""
+						if baseInfo[v] != nil {
+							date := util.Int64All(baseInfo[v])
+							str = util.FormatDateByInt64(&date, util.Date_Short_Layout)
+						}
+						row.AddCell().SetValue(str)
+					} else if v == "id" {
+						id := SE.EncodeString(mongodb.BsonIdToSId(tmp["_id"]))
+						row.AddCell().SetValue(id)
+					} else {
+						row.AddCell().SetValue(baseInfo[v])
+					}
+				}
+			}
+		}
+
+	}
+	util.Debug("over ---", count)
+	fname := fmt.Sprintf("./数据导出%s.xlsx", util.NowFormat(util.DATEFORMAT))
+	err = file.Save(fname)
+	if err != nil {
+		panic(err)
+	}
+}

src/config.json

@@ -96,80 +96,40 @@
                 "key": "city",
                 "descript": "城市(w)"
             },
-            {
-                "key": "bidamounttype",
-                "descript": "金额类型"
-            },
-            {
-                "key": "district",
-                "descript": "区县(e)"
-            },
-            {
-                "key": "budget",
-                "descript": "预算(a)"
-            },
-            {
-                "key": "bidamount",
-                "descript": "中标金额(z)"
-            },
-            {
-                "key": "s_winner",
-                "descript": "中标单位(d)"
-            },
             {
                 "key": "subtype",
                 "descript": "公告类别"
             },
             {
-                "key": "winnertel",
-                "descript": "中标单位电话"
-            },
-            {
-                "key": "projectscope",
-                "descript": "项目范围"
-            },
-            {
-                "key": "winnerperson",
-                "descript": "中标单位联系人"
-            },
-            {
-                "key": "winneraddr",
-                "descript": "中标单位地址"
+                "key": "district",
+                "descript": "区县(e)"
             },
             {
                 "key": "buyer",
-                "descript": "采购单位(s)"
-            },
-            {
-                "key": "agency",
-                "descript": "代理机构(x)"
+                "descript": "采购单位(a)"
             },
             {
-                "key": "buyertel",
-                "descript": "采购单位电话"
-            },
-            {
-                "key": "agencytel",
-                "descript": "代理机构电话"
+                "key": "budget",
+                "descript": "预算(z)"
             },
             {
-                "key": "buyerperson",
-                "descript": "采购单位联系人"
+                "key": "agency",
+                "descript": "代理机构(s)"
             },
             {
-                "key": "agencyperson",
-                "descript": "代理机构联系人"
+                "key": "bidamount",
+                "descript": "中标金额(x)"
             },
             {
-                "key": "buyeraddr",
-                "descript": "采购单位地址"
+                "key": "s_winner",
+                "descript": "中标单位(d)"
             },
             {
-                "key": "agencyaddr",
-                "descript": "代理机构地址"
+                "key": "bidamounttype",
+                "descript": "金额类型"
             }
         ],
-        "timeplace": [
+        "timeplace":[
             {
                 "key": "publishtime",
                 "descript": "发布时间"
@@ -188,15 +148,11 @@
             },
             {
                 "key": "project_startdate",
-                "descript": "项目开始日期"
+                "descript": "开工日期"
             },
             {
                 "key": "project_completedate",
-                "descript": "项目结束日期"
-            },
-            {
-                "key": "signaturedate",
-                "descript": "合同签订日期"
+                "descript": "竣工日期"
             },
             {
                 "key": "project_duration",
@@ -208,7 +164,7 @@
             },
             {
                 "key": "projectperiod",
-                "descript": "项目周期"
+                "descript": "项目周期（服务周期）"
             },
             {
                 "key": "projectaddr",
@@ -315,6 +271,9 @@
                 "descript": "资金来源"
             },
             {
+                "key": "signaturedate",
+                "descript": "合同签订日期"
+            },{
                 "key": "payway",
                 "descript": "付款方式"
             },
@@ -373,10 +332,6 @@
             {
                 "key": "contract_guarantee",
                 "descript": "是否支持保函"
-            },
-            {
-                "key": "biddiscount",
-                "descript": "投标折扣系数"
             }
         ]
     }

src/front/mark.go

@@ -414,8 +414,10 @@ func (f *Front) UserDataMark() {
 			delete(baseInfo, field)
 		}
 		ex, exp := DataException(baseInfo)
-		setResult["s_excp"] = ex
-		setResult["s_excp_info"] = exp
+		if ex != "" {
+			setResult["s_excp"] = ex
+			setResult["s_excp_info"] = exp
+		}
 		set := map[string]interface{}{
 			"$set": setResult,
 		}

src/front/project.go

@@ -513,6 +513,7 @@ func (f *Front) ProjectGroupTaskRepulse() {
 	success = util.Mgo.Update(sourceinfo, map[string]interface{}{"s_grouptaskid": groupTaskId}, map[string]interface{}{
 		"$set": map[string]interface{}{
 			"b_istag":      false,
+			"b_check":      false, // 质检标记
 			"i_ckdata":     0,
 			"b_isgiveuser": false,
 			"i_updatetime": currenttime,
@@ -521,7 +522,6 @@ func (f *Front) ProjectGroupTaskRepulse() {
 			"s_userid":     "",
 			"s_usertaskid": "",
 			"s_login":      "",
-			"b_check":      "",
 			"v_taginfo":    "",
 			"v_checkinfo":  "",
 		},
@@ -1132,9 +1132,9 @@ func GetDataById(idInfoArr []util.Data, importType, s_sourceinfo string, success
 				// 补充filetext
 				(*bidData)["filetext"] = util.GetFileText(*bidData)
 				// 6.es查询项目合并信息
-				//esQ := `{"query":{"bool":{"must":[{"term":{"ids":"` + id + `"}}]}}}`
-				//info := util.Es.Get("projectset", "projectset", esQ)
-				projectId := qu.ObjToString((*bidData)["projectId"])
+				esQ := `{"query":{"bool":{"must":[{"term":{"ids":"` + id + `"}}]}}}`
+				info := util.Es.Get("projectset", "projectset", esQ)
+				projectId := qu.ObjToString((*info)[0]["_id"])
 				if projectId != "" && len(projectId) == 24 { //舍弃项目id为空和合并错误的
 					project, _ := util.MgoE.FindById(util.ProjectColl, projectId, map[string]interface{}{"ids": 1})
 					if project != nil && len(*project) > 0 {

src/front/remark.go

@@ -92,7 +92,7 @@ func (f *Front) RemarkDetail() {
 	f.T["packskey"] = rep["packskey"]
 	f.T["ck_pclistag"] = rep["purchasingTag"]
 	f.T["timeplace"] = rep["timeplace"]
-	//f.T["purchasinglist"] = rep["purchasinglist"]
+	f.T["purchasinglist"] = rep["purchasinglist"]
 	f.T["other"] = rep["other"]
 	f.T["PurchasinglistField"] = util.PurchasinglistField
 	f.T["WinnerorderField"] = util.WinnerorderField
@@ -136,9 +136,12 @@ func getDetail(id, coll string) map[string]interface{} {
 	rep["packs"] = packs
 	rep["packskey"] = packskey
 	rep["pkg_new"] = pkg_new
-	purchasinglist, isNewStatus := setPurchasingMap(baseInfo) //标的物
-	rep["purchasinglist"] = purchasinglist
-	rep["pcl_new"] = isNewStatus
+	if qu.IntAll((*infoTmp)["i_ckdata"]) == 2 {
+		// 首次标注数据不显示标的物信息
+		purchasinglist, isNewStatus := setPurchasingMap(baseInfo) //标的物
+		rep["purchasinglist"] = purchasinglist
+		rep["pcl_new"] = isNewStatus
+	}
 	worder, worder_new := setWorderMap(baseInfo) //中标候选人
 	rep["worder"] = worder
 	rep["worder_new"] = worder_new
@@ -562,7 +565,7 @@ func GetNextDataId1(id, coll, tid, tag string) string {
 		"_id": map[string]interface{}{
 			"$gt": mgo.StringTOBsonId(id),
 		},
-		"b_check": nil,
+		"b_check": false,
 	}
 	if tid != "" {
 		// 数据有任务 查询带上标注标记

src/front/user.go

@@ -848,11 +848,11 @@ func (f *Front) UserTaskClose() {
 	success := Mgo.Update(sourceInfo, map[string]interface{}{"s_usertaskid": taskid}, map[string]interface{}{
 		"$set": map[string]interface{}{
 			"b_istag":      false,
+			"b_check":      false,
 			"i_ckdata":     0,
 			"i_updatetime": currenttime,
 		},
 		"$unset": map[string]interface{}{
-			"b_check":     "",
 			"v_taginfo":   "",
 			"v_checkinfo": "",
 		},

src/util/config.go

@@ -4,6 +4,7 @@ import (
 	"go.mongodb.org/mongo-driver/mongo"
 	"mongodb"
 	qu "qfw/util"
+	"qfw/util/elastic"
 	"sort"
 	"sync"
 )
@@ -15,6 +16,7 @@ import (
 var (
 	Sysconfig           map[string]interface{} //配置文件
 	Quaconfig           map[string]interface{} //质量配置文件
+	Es                  *elastic.Elastic
 	Mgo                 *mongodb.MongodbSim
 	AllToColl           string              //所有标注数据汇总表
 	Password            string              //默认登陆密码
@@ -96,6 +98,13 @@ func InitConfig() {
 	}
 	MgoB.InitPool()
 
+	esConf := Sysconfig["es"].(map[string]interface{})
+	Es = &elastic.Elastic{
+		S_esurl: qu.ObjToString(esConf["addr"]), //http://172.17.145.170:9800
+		I_size:  qu.IntAllDef(esConf["pool"], 10),
+	}
+	Es.InitElasticSize()
+
 	//ext
 	ext := Sysconfig["extract"].(map[string]interface{})
 	ExtColl1 = qu.ObjToString(ext["coll1"])

src/web/templates/project/check_detail.html

@@ -442,7 +442,6 @@
                 return
             }
         }
-
         if (event.keyCode === 82) {//项目名称快捷键r
             if (event.shiftKey) {
                 app.changeBaseValue(0, '', 2) //删除对应文本
@@ -473,35 +472,35 @@
             } else {
                 app.changeBaseValue(5, text, 2)//填充
             }
-        } else if (event.keyCode === 65) {//预算快捷键a
+        } else if (event.keyCode === 65) {//采购单位快捷键a
             if (event.shiftKey) {
                 app.changeBaseValue(6, '', 2) //删除对应文本
             } else {
                 app.changeBaseValue(6, text, 2)//填充
             }
-        } else if (event.keyCode === 90) {//中标金额快捷键z
+        } else if (event.keyCode === 90) {//预算快捷键z
             if (event.shiftKey) {
                 app.changeBaseValue(7, '', 2) //删除对应文本
             } else {
                 app.changeBaseValue(7, text, 2)//填充
             }
-        } else if (event.keyCode === 83) {//采购单位快捷键s
+        } else if (event.keyCode === 83) {//代理机构快捷键s
             if (event.shiftKey) {
-                app.changeBaseValue(14, '', 2) //删除对应文本
+                app.changeBaseValue(8, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(14, text, 2)//填充
+                app.changeBaseValue(8, text, 2)//填充
             }
-        } else if (event.keyCode === 88) {//代理机构快捷键x
+        } else if (event.keyCode === 88) {//中标金额快捷键x
             if (event.shiftKey) {
-                app.changeBaseValue(15, '', 2) //删除对应文本
+                app.changeBaseValue(9, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(15, text, 2)//填充
+                app.changeBaseValue(9, text, 2)//填充
             }
         } else if (event.keyCode === 68) {//中标单位快捷键d
             if (event.shiftKey) {
-                app.changeBaseValue(8, '', 2) //删除对应文本
+                app.changeBaseValue(10, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(8, text, 2)//填充
+                app.changeBaseValue(10, text, 2)//填充
             }
         }
     });
@@ -921,6 +920,7 @@
                     if (!issave) {
                         alert("请先保存数据！")
                     } else {
+                        console.log(nextid)
                         if (nextid === "") {
                             alert("当前已经是最后一条数据！")
                         } else {

src/web/templates/project/remark_detail.html

@@ -437,7 +437,6 @@
                 return
             }
         }
-
         if (event.keyCode === 82) {//项目名称快捷键r
             if (event.shiftKey) {
                 app.changeBaseValue(0, '', 2) //删除对应文本
@@ -468,35 +467,35 @@
             } else {
                 app.changeBaseValue(5, text, 2)//填充
             }
-        } else if (event.keyCode === 65) {//预算快捷键a
+        } else if (event.keyCode === 65) {//采购单位快捷键a
             if (event.shiftKey) {
                 app.changeBaseValue(6, '', 2) //删除对应文本
             } else {
                 app.changeBaseValue(6, text, 2)//填充
             }
-        } else if (event.keyCode === 90) {//中标金额快捷键z
+        } else if (event.keyCode === 90) {//预算快捷键z
             if (event.shiftKey) {
                 app.changeBaseValue(7, '', 2) //删除对应文本
             } else {
                 app.changeBaseValue(7, text, 2)//填充
             }
-        } else if (event.keyCode === 83) {//采购单位快捷键s
+        } else if (event.keyCode === 83) {//代理机构快捷键s
             if (event.shiftKey) {
-                app.changeBaseValue(14, '', 2) //删除对应文本
+                app.changeBaseValue(8, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(14, text, 2)//填充
+                app.changeBaseValue(8, text, 2)//填充
             }
-        } else if (event.keyCode === 88) {//代理机构快捷键x
+        } else if (event.keyCode === 88) {//中标金额快捷键x
             if (event.shiftKey) {
-                app.changeBaseValue(15, '', 2) //删除对应文本
+                app.changeBaseValue(9, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(15, text, 2)//填充
+                app.changeBaseValue(9, text, 2)//填充
             }
         } else if (event.keyCode === 68) {//中标单位快捷键d
             if (event.shiftKey) {
-                app.changeBaseValue(8, '', 2) //删除对应文本
+                app.changeBaseValue(10, '', 2) //删除对应文本
             } else {
-                app.changeBaseValue(8, text, 2)//填充
+                app.changeBaseValue(10, text, 2)//填充
             }
         }
     });