前后:合同跨年年份;基本条件评价结果隐藏

src/dashoo.cn/backend/api/controllers/oilcontract/contract.go

@@ -1148,7 +1148,7 @@ func (this *OilContractController) ImportExcel() {
 			if con.PerformAmount == "" {
 				con.PerformAmount = "0"
 			}
-			con.IsYearMoney = con.PerformAmount
+			con.IsYearMoney = con.Amount
 			con.IsInternal = 0
 			//if sheet.Rows[i].Cells[18].String() == "是" {
 			//	con.IsInternal = 1
@@ -1432,10 +1432,12 @@ func (this *OilContractController) AddEntity() {
 	var errinfo ErrorDataInfo
 
 	var model contract.OilContract
+	var model2 contract.OilContractMoney
 	var jsonBlob = this.Ctx.Input.RequestBody
 	svc := contract.GetOilContractService(utils.DBE)
 
 	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &model2)
 
 	if model.IsYear == 1 && model.IsYearMoney == "" {
 		errinfo.Message = "跨年当年结算金额必填"
@@ -1477,10 +1479,10 @@ func (this *OilContractController) AddEntity() {
 	if err == nil {
 		if model.IsYear == 1 {
 			svc.GetEntityByWhere(OilContractName, "ContractNo = '"+model.ContractNo+"'", &model)
-			svc.GetEntityByWhere("OilContractMoney", "Year = '"+time.Now().Format("2006")+"' and ContractId = "+strconv.Itoa(model.Id), &model1)
+			//svc.GetEntityByWhere("OilContractMoney", "Year = '"+time.Now().Format("2006")+"' and ContractId = "+strconv.Itoa(model.Id), &model1)
 			model1.ContractId = model.Id
 			model1.Money = model.IsYearMoney
-			model1.Year = time.Now().Format("2006")
+			model1.Year = model2.Year
 			model1.CreateOn = time.Now()
 			model1.CreateBy = this.User.Realname
 			model1.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -1518,10 +1520,12 @@ func (this *OilContractController) UpdateEntity() {
 
 	var model contract.OilContract
 	var model1 contract.OilContractMoney
+	var model2 contract.OilContractMoney
 	svc := contract.GetOilContractService(utils.DBE)
 
 	var jsonBlob = this.Ctx.Input.RequestBody
 	json.Unmarshal(jsonBlob, &model)
+	json.Unmarshal(jsonBlob, &model2)
 
 	if model.IsYear == 1 && model.IsYearMoney == "" {
 		errinfo.Message = "跨年当年结算金额必填"
@@ -1687,7 +1691,7 @@ func (this *OilContractController) UpdateEntity() {
 	err := svc.UpdateEntityBytbl(OilContractName, id, &model, cols)
 	if err == nil {
 		if model.IsYear == 1 && model.IsYearMoney != "" {
-			svc.GetEntityByWhere("OilContractMoney", "Year = '"+time.Now().Format("2006")+"' and ContractId = "+id, &model1)
+			svc.GetEntityByWhere("OilContractMoney", "Year = '"+model2.Year+"' and ContractId = "+id, &model1)
 			if model1.Id > 0 {
 				model1.Money = model.IsYearMoney
 				model1.ModifiedOn = time.Now()
@@ -1697,7 +1701,7 @@ func (this *OilContractController) UpdateEntity() {
 			} else {
 				model1.ContractId, _ = strconv.Atoi(id)
 				model1.Money = model.IsYearMoney
-				model1.Year = time.Now().Format("2006")
+				model1.Year = model2.Year
 				model1.CreateOn = time.Now()
 				model1.CreateBy = this.User.Realname
 				model1.CreateUserId, _ = utils.StrTo(this.User.Id).Int()

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year/_opera/operation.vue

@@ -104,12 +104,12 @@
                               style="width: 100%"></el-input-number>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="基本条件评价结果" prop="Result2">-->
+<!--                    <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"-->
+<!--                              style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
                 <el-col :span="16">
@@ -201,12 +201,12 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="基本条件评价结果" prop="Result2">-->
+<!--                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"-->
+<!--                              style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
                 <el-col :span="16">
                   <el-form-item label="备注">
                     <el-input type="textarea" :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Note"

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-import/_opera/operation.vue

@@ -455,6 +455,16 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="跨年时间" prop="Year">
+              <el-date-picker
+                v-model="formData.Year"
+                type="year"
+                value-format="yyyy"
+                placeholder="选择年份">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="跨年至" prop="YearDate">-->
 <!--              <el-date-picker-->
@@ -769,6 +779,7 @@ export default {
       formData: {
         Id: '',
         SecondUnitName: '',
+        Year: '',
         SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
@@ -864,6 +875,7 @@ export default {
 
     this.serviceId = this.$route.params.opera
     this.getDictOptions()
+    let myDate = new Date()
     if (this.serviceId != 'add' && this.serviceId > 0) {
       this.formData.Id = this.serviceId
       this.countMoney(this.formData.Id)
@@ -871,6 +883,7 @@ export default {
       this.initDatas()
       this.successBoolean = true
     } else {
+      this.formData.Year = myDate.getFullYear() + ''
       this.formData.Id = 0
     }
     this.statusFun()
@@ -1004,6 +1017,8 @@ export default {
         api.getEntity(this.formData.Id, this.$axios).then(res => {
           console.log('返给我的数据', res.data)
           this.formData = res.data
+          let myDate = new Date()
+          this.formData.Year = myDate.getFullYear() + ''
           if (this.formData.SupplierId == 0) {
             this.formData.SupplierId = ''
           }

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service-year/_opera/operation.vue

@@ -98,12 +98,12 @@
                                      placeholder="请输入" style="width: 100%"/>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="基本条件评价结果" prop="Result2">-->
+<!--                    <el-input :readonly="true" v-model="evaluateData.Result2" placeholder="请输入"-->
+<!--                              style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
                 <el-col :span="24">
@@ -186,12 +186,12 @@
                               style="width: 100%"  :max="100" :min="0"></el-input-number>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8">
-                  <el-form-item label="基本条件评价结果" prop="Result2">
-                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="8">-->
+<!--                  <el-form-item label="基本条件评价结果" prop="Result2">-->
+<!--                    <el-input :disabled="!auditBtnBooleanZhuan" v-model="evaluateDataZhuan.Result2" placeholder="请输入"-->
+<!--                              style="width: 100%"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
                 <el-col :span="24">