前后:修改二级单位

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -55,7 +55,7 @@ func (s *OilContractService) GetHandOnStatisticsList (queryParam HandOnStatistic
 
 }
 
-func (s *OilContractService) GetSum(entitiesPtr interface{}, where string) {
+func (s *OilContractService) GetSum1(entitiesPtr interface{}, where string) {
 
 	sql := ` select sum(Money) as Money from OilContractMoney`
 	sql += ` where ` + where

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

@@ -1188,7 +1188,7 @@ func (this *OilContractController) CountMoney() {
 
 	var model contract.OilContractMoney
 	svc := contract.GetOilContractService(utils.DBE)
-	svc.GetSum(&model, "Year != '"+time.Now().Format("2006")+"'")
+	svc.GetSum1(&model, "ContractId = " + Id + " and Year != '"+time.Now().Format("2006")+"'")
 	this.Data["json"] = &model
 	this.ServeJSON()
 }

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

@@ -414,7 +414,7 @@
       <div slot="header" class="clearfix">
         <span>跨年记录</span>
       </div>
-      <el-form id="rebateSetTable1" label-width="110px" ref="EntityForm" :rules="rules" :model="formData"
+      <el-form id="rebateSetTable1" label-width="110px" :model="formData"
                class="fromClass web_fromclass">
         <el-row>
           <el-col :span="8">
@@ -459,21 +459,23 @@
       title="修改二级单位"
       :visible.sync="dialogVisibleContract"
       :close-on-click-modal="false"
-      width="80%">
+      width="50%">
       <el-form :model="formData" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
         <el-row>
-          <el-col :span="8">
+          <el-col :span="20">
             <el-form-item label="二级单位" prop="SecondUnitName">
               <el-input v-model="formData.SecondUnitName" placeholder="请输入" style="width: 50%" readonly></el-input>
             </el-form-item>
             </el-col>
-          <el-col :span="8">
+        </el-row>
+        <el-row>
+          <el-col :span="20">
             <el-form-item label="新二级单位" prop="SecondUnitName">
               <el-select filterable ref="issueFromSelect" v-model="NewUnitId" class="select_form"
-                                       placeholder="请选择二级单位" style="width: 50%;">
-                              <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
-                                         style="width: 100%;"></el-option>
-                            </el-select>
+                         placeholder="请选择二级单位" style="width: 50%;">
+                <el-option v-for="item in orgOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%;"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>

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

@@ -764,6 +764,12 @@
             width: 100,
             sort: true
           },
+          {
+            prop: 'SecondUnitName',
+            label: '二级单位',
+            width: 100,
+            sort: true
+          },
 
           {
             prop: 'ProjectName',