wd 4 anni fa
parent
commit
b351d25a4a

+ 10 - 0
src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -1048,6 +1048,8 @@ func (this *OilContractController) ImportExcel() {
 					con1.ClassName = sheet.Rows[i].Cells[0].String()
 					if con1.ClassName == "买卖合同" {
 						con1.ContractClass = "01"
+					} else if con1.ClassName == "建设工程合同" {
+						con.ContractClass = "02"
 					} else {
 						con1.ContractClass = "03"
 					}
@@ -1099,6 +1101,9 @@ func (this *OilContractController) ImportExcel() {
 					//con1.SealName = sheet.Rows[i].Cells[42].String()
 					//con1.PoNumber = sheet.Rows[i].Cells[31].String()
 					//con1.ImportStatus = 0
+					con1.CreateOn = time.Now()
+					con1.CreateBy = this.User.Realname
+					con1.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 					svc.UpdateEntityById(con1.Id, &con1)
 					continue
 				}
@@ -1106,6 +1111,8 @@ func (this *OilContractController) ImportExcel() {
 			con.ClassName = sheet.Rows[i].Cells[0].String()
 			if con.ClassName == "买卖合同" {
 				con.ContractClass = "01"
+			} else if con.ClassName == "建设工程合同" {
+				con.ContractClass = "02"
 			} else {
 				con.ContractClass = "03"
 			}
@@ -1180,6 +1187,9 @@ func (this *OilContractController) ImportExcel() {
 			con.ImportStatus = 0
 			con.Status = 1
 			con.SettleStatus = "1"
+			con.CreateOn = time.Now()
+			con.CreateBy = this.User.Realname
+			con.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 			_, err = svc.InsertEntityBytbl(OilContractName, &con)
 			if err != nil {
 				fmt.Println(err)

+ 1 - 1
src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/_opera/evaluate.vue

@@ -10,7 +10,7 @@
       <div slot="header">
         <span>
           <i class="icon icon-table2"></i> 编辑 - 承包商合同
-          <span style="color: red">(打分表默认为满分,有修改的可直接在上面修改)</span>
+          <span style="color: red">(打分表默认为满分,如需修改得分可直接在表单中修改分值。)</span>
         </span>
         <span style="float: right ">
           <el-button type="primary" size="mini" style="margin-left: 8px" v-if="formData.Id!=0"