后:详情

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

@@ -946,9 +946,12 @@ func (this *OilContractController) AddEntity() {
 		return
 	}
 	if model.IsYearMoney == "" {
-		model.IsYearMoney = model.PerformAmount
+		//model.IsYearMoney = model.PerformAmount
+		model.IsYearMoney = model.Amount
 	}
 	model.ImportStatus = 2
+	model.BudgetAmount = "0"
+	model.PerformAmount = "0"
 	model.CreateOn = time.Now()
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
@@ -1158,6 +1161,8 @@ func (this *OilContractController) UpdateEntity() {
 		"IsYearMoney",
 
 		"IsYear",
+
+		"ClassName",
 	}
 
 	var contract contract.OilContract

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

@@ -35,8 +35,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="企业名称" prop="SupplierId">
+          <el-col :span="8" v-if="formData.ImportStatus != 2">
+            <el-form-item label="导入企业名称" prop="SupplierName">
+              <el-input v-model="formData.ImportSupplierName" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="formData.ImportStatus != 2">
+            <el-form-item label="确认企业名称">
               <el-select :disabled="ContractClassDisabled" filterable ref="SupplierSelect" v-model="formData.SupplierId"
                          placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
                 <el-option :label="item.SupplierName" :value="item.Id" v-for="(item,index) of SupplierSelectList"
@@ -44,9 +49,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同编号" prop="ContractNo">
-              <el-input v-model="formData.ContractNo" placeholder="请输入" style="width: 100%"></el-input>
+          <el-col :span="8" v-else>
+            <el-form-item label="确认企业名称" prop="SupplierId">
+              <el-select :disabled="ContractClassDisabled" filterable ref="SupplierSelect" v-model="formData.SupplierId"
+                         placeholder="请选择" style="width: 100%" @change="supplierChangeHandler">
+                <el-option :label="item.SupplierName" :value="item.Id" v-for="(item,index) of SupplierSelectList"
+                           :key="index"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 <!--          <el-col :span="8">-->
@@ -56,6 +65,11 @@
 <!--          </el-col>-->
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="合同编号" prop="ContractNo">
+              <el-input v-model="formData.ContractNo" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="合同类别" prop="ClassName">
               <el-input v-model="formData.ClassName" placeholder="请输入" style="width: 100%"></el-input>
@@ -66,13 +80,6 @@
               <el-input v-model="formData.ContractName" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="合同总金额" prop="Amount">
-              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
 
 
 
@@ -86,6 +93,13 @@
 <!--          </el-col>-->
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="合同总金额" prop="Amount">
+              <el-input v-model="formData.Amount" placeholder="请输入" style="width: 100%">
+                <template slot="append">(元)</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="8">
             <el-form-item label="项目负责人" prop="ProjectOwner">
               <el-input v-model="formData.ProjectOwner" placeholder="请输入" style="width: 100%"></el-input>
@@ -96,11 +110,7 @@
               <el-input v-model="formData.Telephone" placeholder="请输入" maxlength="11" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="报审序号" prop="Number">
-              <el-input v-model="formData.Number" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
+
 <!--          <el-col :span="8">-->
 <!--            <el-form-item label="项目类别" prop="ProjectType">-->
 <!--              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">-->
@@ -186,6 +196,11 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="报审序号" prop="Number">
+              <el-input v-model="formData.Number" placeholder="请输入" style="width: 100%"></el-input>
+            </el-form-item>
+          </el-col>
 
           <el-col :span="8">
             <el-form-item label="工程地点" prop="ProjectPlace">
@@ -388,7 +403,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <el-row v-if="formData.ContractClass == '02'">
 
           <el-col :span="8">
             <el-form-item label="质量监督单位">
@@ -604,6 +619,9 @@ export default {
         SupplierId: [
           {required: true, message: '请选择企业名称', trigger: 'change'}
         ],
+        SupplierName: [
+          {required: true, message: '请输入企业名称', trigger: 'blur'}
+        ],
         ProjectName: [
           {required: true, message: '请输入项目名称', trigger: 'blur'}
         ],
@@ -754,6 +772,8 @@ export default {
         SecondUnit: '',
         SupplierId: '',
         SupplierName: '',
+        ClassName: '',
+        ContractName: '',
         Status: 1,
         SettleStatus: '1',
         ProjectName: '',
@@ -782,6 +802,8 @@ export default {
         QualityTelphone: '',
         Remark: '',
         IsYear: 0,
+        ImportStatus: 2,
+        ImportSupplierName: '',
         IsYearMoney: '',
         // IsDelete: '',
         // CreateOn: '',
@@ -976,6 +998,9 @@ export default {
         api.getEntity(this.formData.Id, this.$axios).then(res => {
           console.log('返给我的数据', res.data)
           this.formData = res.data
+          if (this.formData.SupplierId == 0) {
+            this.formData.SupplierId = ''
+          }
           this.successBoolean = true
           this.onSelectType(this.formData.ContractClass, 1)
 

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

@@ -190,85 +190,85 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="建设单位">
-              <el-input size="mini" v-model="searchForm.ConstructionUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="建设单位">-->
+<!--              <el-input size="mini" v-model="searchForm.ConstructionUnit" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="建设负责人">
-              <el-input size="mini" v-model="searchForm.ConstructionOwner" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号">
-              <el-input size="mini" v-model="searchForm.ConstructionTelphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="建设负责人">-->
+<!--              <el-input size="mini" v-model="searchForm.ConstructionOwner" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="手机号">-->
+<!--              <el-input size="mini" v-model="searchForm.ConstructionTelphone" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="施工单位">
-              <el-input size="mini" v-model="searchForm.BuildUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="施工负责人">
-              <el-input size="mini" v-model="searchForm.BuildOwner" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="施工单位">-->
+<!--              <el-input size="mini" v-model="searchForm.BuildUnit" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="施工负责人">-->
+<!--              <el-input size="mini" v-model="searchForm.BuildOwner" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="手机号">
-              <el-input size="mini" v-model="searchForm.BuildTelphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="监理单位">
-              <el-input size="mini" v-model="searchForm.SuperviseUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="手机号">-->
+<!--              <el-input size="mini" v-model="searchForm.BuildTelphone" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="监理单位">-->
+<!--              <el-input size="mini" v-model="searchForm.SuperviseUnit" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="监理负责人">
-              <el-input size="mini" v-model="searchForm.SuperviseOwner" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="手机号">
-              <el-input size="mini" v-model="searchForm.SuperviseTelphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="监理负责人">-->
+<!--              <el-input size="mini" v-model="searchForm.SuperviseOwner" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="手机号">-->
+<!--              <el-input size="mini" v-model="searchForm.SuperviseTelphone" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="质量监督单位">
-              <el-input size="mini" v-model="searchForm.QualityUnit" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="质量监督负责人">
-              <el-input size="mini" v-model="searchForm.QualityOwner" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="质量监督单位">-->
+<!--              <el-input size="mini" v-model="searchForm.QualityUnit" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="质量监督负责人">-->
+<!--              <el-input size="mini" v-model="searchForm.QualityOwner" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="手机号">
-              <el-input size="mini" v-model="searchForm.QualityTelphone" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="手机号">-->
+<!--              <el-input size="mini" v-model="searchForm.QualityTelphone" style="width:100%" placeholder="请输入"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-        </el-row>
+<!--        </el-row>-->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="mini" @click="dialogVisible = false">取 消</el-button>
@@ -683,6 +683,7 @@
         searchForm: {
           Id: '',
           SupplierId: '',
+          ContractClass: '',
           ImportSecondUnit: '',
           SupplierName: '',
           ContractName: '',