前后:文案;排版;新建评价默认自己单位

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

@@ -114,6 +114,7 @@ func (this *OilContractController) GetEntityList() {
 	ImportStatus := this.GetString("ImportStatus")
 	ContractClass := this.GetString("ContractClass")
 	ClassName := this.GetString("ClassName")
+	SecondUnit := this.GetString("SecondUnit")
 
 	if Id != "" {
 		where = where + " and Id like '%" + Id + "%'"
@@ -123,6 +124,10 @@ func (this *OilContractController) GetEntityList() {
 		where = where + " and ContractClass='" + ContractClass + "' "
 	}
 
+	if SecondUnit != "" {
+		where = where + " and SecondUnit=" + SecondUnit + " "
+	}
+
 	if ClassName != "" {
 		where = where + " and ClassName='" + ClassName + "' "
 	}
@@ -966,6 +971,11 @@ func (this *OilContractController) AddEntity() {
 	model.CreateBy = this.User.Realname
 	model.CreateUserId, _ = utils.StrTo(this.User.Id).Int()
 	model.SecondUnit = this.User.UnitId
+	var org organize.Base_Organize
+	svc.GetEntityByWhere("Base_Organize", "Id = " + strconv.Itoa(this.User.UnitId), &org)
+	if org.Id > 0 {
+		model.SecondUnitName = org.Fullname
+	}
 
 	var model1 contract.OilContractMoney
 	var contract contract.OilContract

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

@@ -62,11 +62,12 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="承包商名称">
-                    <el-select ref="SupplierSelect" v-model="contractData.SupplierName" :disabled="true"
-                               placeholder="请选择" style="width: 100%"></el-select>
+                    <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同编号">
                     <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
@@ -74,6 +75,12 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="8">
+                  <el-form-item label="合同类别">
+                    <el-input :disabled="disabled" v-model="contractData.ClassName" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="合同名称">
                     <el-input :disabled="disabled" v-model="contractData.ContractName" placeholder="请输入"
@@ -82,12 +89,6 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="8">
                   <el-form-item  label="合同总金额" >
                     <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
@@ -95,6 +96,29 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="项目负责人">
+                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人电话">
+                    <el-input :disabled="disabled" v-model="contractData.Telephone" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同状态">
+                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
+                      <el-option label="未履行" :value="1" key="01"></el-option>
+                      <el-option label="履行中" :value="2" key="02"></el-option>
+                      <el-option label="履行完毕" :value="3" key="03"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="签订日期">
                     <el-date-picker
@@ -106,6 +130,11 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="报审序号">
+                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
@@ -139,59 +168,15 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="合同状态">
-                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
-                      <el-option label="履行完毕" :value="3" key="03"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <el-input :disabled="disabled"  v-model="contractData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="是否分包">
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
-                      <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="0" label="否" :value="0"></el-option>
-                    </el-select>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-<!--                <el-col :span="8">-->
-<!--                  <el-form-item label="项目类别">-->
-<!--                    <el-select :disabled="disabled" v-model="contractData.ProjectType" placeholder="请选择"-->
-<!--                               style="width: 100%">-->
-<!--                      <el-option key="1" label="咨询" value="1"></el-option>-->
-<!--                      <el-option key="2" label="勘探" value="2"></el-option>-->
-<!--                      <el-option key="3" label="设计" value="3"></el-option>-->
-<!--                      <el-option key="4" label="施工" value="4"></el-option>-->
-<!--                    </el-select>-->
-<!--                  </el-form-item>-->
-<!--                </el-col>-->
-
-              </el-row>
             </el-form>
 
+
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2">

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

@@ -62,11 +62,12 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="供应商名称">
-                    <el-select ref="SupplierSelect" v-model="contractData.SupplierName" :disabled="true"
-                               placeholder="请选择" style="width: 100%"></el-select>
+                    <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同编号">
                     <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
@@ -74,6 +75,12 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="8">
+                  <el-form-item label="合同类别">
+                    <el-input :disabled="disabled" v-model="contractData.ClassName" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="合同名称">
                     <el-input :disabled="disabled" v-model="contractData.ContractName" placeholder="请输入"
@@ -82,12 +89,6 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="8">
                   <el-form-item  label="合同总金额" >
                     <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
@@ -95,6 +96,29 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="项目负责人">
+                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人电话">
+                    <el-input :disabled="disabled" v-model="contractData.Telephone" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同状态">
+                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
+                      <el-option label="未履行" :value="1" key="01"></el-option>
+                      <el-option label="履行中" :value="2" key="02"></el-option>
+                      <el-option label="履行完毕" :value="3" key="03"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="签订日期">
                     <el-date-picker
@@ -106,6 +130,11 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="报审序号">
+                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
@@ -139,56 +168,11 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="合同状态">
-                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
-                      <el-option label="履行完毕" :value="3" key="03"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <el-input :disabled="disabled"  v-model="contractData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="是否分包">
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
-                      <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="0" label="否" :value="0"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"
-                              style="width: 100%"></el-input>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--                <el-col :span="8">-->
-                <!--                  <el-form-item label="项目类别">-->
-                <!--                    <el-select :disabled="disabled" v-model="contractData.ProjectType" placeholder="请选择"-->
-                <!--                               style="width: 100%">-->
-                <!--                      <el-option key="1" label="咨询" value="1"></el-option>-->
-                <!--                      <el-option key="2" label="勘探" value="2"></el-option>-->
-                <!--                      <el-option key="3" label="设计" value="3"></el-option>-->
-                <!--                      <el-option key="4" label="施工" value="4"></el-option>-->
-                <!--                    </el-select>-->
-                <!--                  </el-form-item>-->
-                <!--                </el-col>-->
-
               </el-row>
             </el-form>
 

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

@@ -17,7 +17,7 @@
           <el-button type="primary" size="mini" v-if="succseButton && formData.Id!=0 && ![1, 2, 3].includes(formData.Status)" @click="onFinish">完结</el-button>
           <el-button type="primary" size="mini" v-if="successBoolean" @click="exportExcel">导出</el-button>
           <el-button type="primary" size="mini" :loading="addloading" @click="saveEntity">保存</el-button>
-          <el-button type="primary" size="mini" @click="updateName">修改项目建设单位</el-button>
+          <el-button type="primary" size="mini" v-if="importAuditProf" @click="updateName">修改项目建设单位</el-button>
           <router-link :to="'/oilcontract/contract-import'">
             <el-button type="primary" size="mini" plain style="margin-left: 8px">返回</el-button>
           </router-link>
@@ -131,18 +131,32 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="合同模式" prop="ContractMode">
-              <el-input v-model="formData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>
+            <el-form-item label="签订日期" prop="SignedDate">
+              <el-date-picker
+                v-model="formData.SignedDate"
+                type="date"
+                placeholder="选择日期">
+              </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="是否分包" prop="SubPackage">
-              <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">
-                <el-option :key="1" label="是" :value="1"></el-option>
-                <el-option :key="0" label="否" :value="0"></el-option>
-              </el-select>
+            <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="ContractMode">-->
+<!--              <el-input v-model="formData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="是否分包" prop="SubPackage">-->
+<!--              <el-select placeholder="请选择" v-model="formData.SubPackage" style="width: 100%">-->
+<!--                <el-option :key="1" label="是" :value="1"></el-option>-->
+<!--                <el-option :key="0" label="否" :value="0"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
 
         </el-row>
@@ -187,26 +201,11 @@
 <!--          </el-col>-->
           <!-- 新加的 -->
 
-          <el-col :span="8">
-            <el-form-item label="签订日期" prop="SignedDate">
-              <el-date-picker
-                v-model="formData.SignedDate"
-                type="date"
-                placeholder="选择日期">
-              </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">
-              <el-input v-model="formData.ProjectPlace" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="工程地点" prop="ProjectPlace">-->
+<!--              <el-input v-model="formData.ProjectPlace" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
 <!--        <el-row>-->
 <!--          <el-col :span="8">-->
@@ -484,19 +483,19 @@
       :visible.sync="dialogVisibleContract"
       :close-on-click-modal="false"
       width="50%">
-      <el-form :model="formData" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+      <el-form :model="formData" :rules="rules" ref="ruleForm" label-width="120px" class="demo-ruleForm">
         <el-row>
           <el-col :span="20">
-            <el-form-item label="二级单位" prop="SecondUnitName">
+            <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-row>
         <el-row>
           <el-col :span="20">
-            <el-form-item label="新二级单位" prop="SecondUnitName">
+            <el-form-item label="新项目建设单位" prop="SecondUnitName">
               <el-select filterable ref="issueFromSelect" v-model="NewUnitId" class="select_form"
-                         placeholder="请选择二级单位" style="width: 50%;">
+                         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>
@@ -603,6 +602,7 @@ export default {
       },
       dialogVisibleContract: false,
       updateLoading: false,
+      importAuditProf: false,
       updateLoading1: false,
       orgOptions: [],
       issueVisible: false, // 下发弹窗
@@ -853,6 +853,7 @@ export default {
     }
   },
   created () {
+    this.getAuditPermForProf()
     this.GetorgOptions()
     api.getDictList(this.$axios).then(res => {
       console.log('数据字典', res)
@@ -875,6 +876,11 @@ export default {
     this.statusFun()
   },
   methods: {
+    getAuditPermForProf () {
+      permissionApi.getAuditPermForProf(this.$axios).then(res => {
+        this.importAuditProf = res.data
+      })
+    },
     yearList (id) {
       api.yearList(id, this.$axios).then(res => {
         this.yearTable = res.data
@@ -1028,6 +1034,12 @@ export default {
       this.dialogVisibleContract = true
     },
     updateUnitName (val) {
+      if (!this.formData.Id) {
+        this.$message({
+          type: 'warning',
+          message: '请先创建合同'
+        })
+      }
       if (val) {
         this.updateLoading = true
       } else {

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

@@ -119,12 +119,12 @@
 
           <el-col :span="12">
             <el-form-item label="企业名称">
-              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="项目建设单位">
-              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择" style="width: 100%">
+              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择" style="width: 100%" clearable>
                 <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
                            style="width: 100%">
                 </el-option>
@@ -134,19 +134,19 @@
 
           <el-col :span="12">
             <el-form-item label="合同名称">
-              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="合同编号">
-              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
             <el-form-item label="合同类别">
-              <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
@@ -172,43 +172,43 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="工程地点">
-              <el-input size="mini" v-model="searchForm.ProjectPlace" 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.ProjectPlace" style="width:100%" placeholder="请输入" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <el-col :span="12">
             <el-form-item label="项目负责人">
-              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
+              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="联系人电话">
-              <el-input size="mini" v-model="searchForm.Telephone" 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.Telephone" style="width:100%" placeholder="请输入" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
-          <el-col :span="12">
-            <el-form-item label="合同模式">
-              <el-input size="mini" v-model="searchForm.ContractMode" 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.ContractMode" style="width:100%" placeholder="请输入" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 
           <el-col :span="12">
             <el-form-item label="合同总金额">
-              <el-input size="mini" v-model="searchForm.Amount" placeholder="请输入" style="width: 100%">
+              <el-input size="mini" v-model="searchForm.Amount" placeholder="请输入" style="width: 100%" clearable>
                 <template slot="append">(元)</template>
               </el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12">
-            <el-form-item label="合同总工期(天)">
-              <el-input size="mini" v-model="searchForm.ContractPeriod" 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.ContractPeriod" style="width:100%" placeholder="请输入" clearable></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="履行时间">
               <el-date-picker size="mini" v-model="CreateOn1" type="daterange" style="width:100%" range-separator="至"
@@ -880,13 +880,6 @@
             sort: true
           },
 
-          {
-            prop: 'ProjectPlace',
-            label: '工程地点',
-            width: 100,
-            sort: true
-          },
-
           {
             prop: 'ProjectOwner',
             label: '项目负责人',
@@ -894,12 +887,12 @@
             sort: true
           },
 
-          {
-            prop: 'Telephone',
-            label: '联系人电话',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: 'Telephone',
+          //   label: '联系人电话',
+          //   width: 100,
+          //   sort: true
+          // },
 
           // {
           //   prop: 'ProjectTypeName',
@@ -908,12 +901,12 @@
           //   sort: true
           // },
 
-          {
-            prop: 'ContractMode',
-            label: '合同模式',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: 'ContractMode',
+          //   label: '合同模式',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: 'Amount',
@@ -922,12 +915,12 @@
             sort: true
           },
 
-          {
-            prop: 'ContractPeriod',
-            label: '合同总工期(天)',
-            width: 100,
-            sort: true
-          },
+          // {
+          //   prop: 'ContractPeriod',
+          //   label: '合同总工期(天)',
+          //   width: 100,
+          //   sort: true
+          // },
 
           {
             prop: 'StartDate',

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

@@ -62,11 +62,12 @@
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
-                    <el-select ref="SupplierSelect" v-model="contractData.SupplierName" :disabled="true"
-                               placeholder="请选择" style="width: 100%"></el-select>
+                    <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                              style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
-
+              </el-row>
+              <el-row>
                 <el-col :span="8">
                   <el-form-item label="合同编号">
                     <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
@@ -74,6 +75,12 @@
                   </el-form-item>
                 </el-col>
 
+                <el-col :span="8">
+                  <el-form-item label="合同类别">
+                    <el-input :disabled="disabled" v-model="contractData.ClassName" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="合同名称">
                     <el-input :disabled="disabled" v-model="contractData.ContractName" placeholder="请输入"
@@ -82,12 +89,6 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="报审序号">
-                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
                 <el-col :span="8">
                   <el-form-item  label="合同总金额" >
                     <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
@@ -95,6 +96,29 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="项目负责人">
+                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="联系人电话">
+                    <el-input :disabled="disabled" v-model="contractData.Telephone" placeholder="请输入"
+                              style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同状态">
+                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
+                      <el-option label="未履行" :value="1" key="01"></el-option>
+                      <el-option label="履行中" :value="2" key="02"></el-option>
+                      <el-option label="履行完毕" :value="3" key="03"></el-option>
+                    </el-select>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="8">
                   <el-form-item label="签订日期">
                     <el-date-picker
@@ -106,6 +130,11 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+                <el-col :span="8">
+                  <el-form-item label="报审序号">
+                    <el-input :disabled="disabled" v-model="contractData.Number" placeholder="请输入" style="width: 100%"></el-input>
+                  </el-form-item>
+                </el-col>
               </el-row>
               <el-row>
                 <el-col :span="8">
@@ -139,59 +168,15 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="8">
-                  <el-form-item label="合同状态">
-                    <el-select :disabled="disabled"  v-model="contractData.Status" placeholder="请选择" style="width: 100%">
-                      <el-option label="未履行" :value="1" key="01"></el-option>
-                      <el-option label="履行中" :value="2" key="02"></el-option>
-                      <el-option label="履行完毕" :value="3" key="03"></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="合同模式">
-                    <el-input :disabled="disabled"  v-model="contractData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="是否分包">
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage" style="width: 100%">
-                      <el-option :key="1" label="是" :value="1"></el-option>
-                      <el-option :key="0" label="否" :value="0"></el-option>
-                    </el-select>
+                <el-col :span="24">
+                  <el-form-item label="备注">
+                    <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="工程地点">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectPlace" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <el-col :span="8">
-                  <el-form-item label="项目负责人">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
-                  </el-form-item>
-                </el-col>
-
-                <!--                <el-col :span="8">-->
-                <!--                  <el-form-item label="项目类别">-->
-                <!--                    <el-select :disabled="disabled" v-model="contractData.ProjectType" placeholder="请选择"-->
-                <!--                               style="width: 100%">-->
-                <!--                      <el-option key="1" label="咨询" value="1"></el-option>-->
-                <!--                      <el-option key="2" label="勘探" value="2"></el-option>-->
-                <!--                      <el-option key="3" label="设计" value="3"></el-option>-->
-                <!--                      <el-option key="4" label="施工" value="4"></el-option>-->
-                <!--                    </el-select>-->
-                <!--                  </el-form-item>-->
-                <!--                </el-col>-->
-
-              </el-row>
             </el-form>
 
+
           </el-card>
         </el-tab-pane>
         <el-tab-pane label="业绩评价" name="2">