前:详情

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

@@ -58,7 +58,7 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
               </span> -->
             </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData" >
+            <el-form label-width="110px" ref="EntityForm" :model="contractData" >
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="承包商名称">
@@ -68,56 +68,128 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="承包项目名称">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"
+                  <el-form-item label="合同编号">
+                    <el-input :disabled="disabled" v-model="contractData.ContractNo" 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.ProjectPlace" placeholder="请输入"
+                  <el-form-item label="合同名称">
+                    <el-input :disabled="disabled" v-model="contractData.ContractName" 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="请输入"
-                              style="width: 100%"></el-input>
+                  <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.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
+                  <el-form-item  label="合同总金额" >
+                    <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <template slot="append">(元)</template>
+                    </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-form-item label="签订日期">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.SignedDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同总工期">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                      <template slot="append">(天)</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(始)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.StartDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(止)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.EndDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </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-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="是否分包">
-                    <!-- SubPackage -->
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage"
-                               style="width: 100%">
+                    <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-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>

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

@@ -58,7 +58,7 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
               </span> -->
             </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
+            <el-form label-width="110px" ref="EntityForm" :model="contractData" >
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="供应商名称">
@@ -68,58 +68,131 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="供应项目名称">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"
+                  <el-form-item label="合同编号">
+                    <el-input :disabled="disabled" v-model="contractData.ContractNo" 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.ProjectPlace" placeholder="请输入"
+                  <el-form-item label="合同名称">
+                    <el-input :disabled="disabled" v-model="contractData.ContractName" 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="请输入"
-                              style="width: 100%"></el-input>
+                  <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.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
+                  <el-form-item  label="合同总金额" >
+                    <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <template slot="append">(元)</template>
+                    </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-form-item label="签订日期">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.SignedDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同总工期">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                      <template slot="append">(天)</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(始)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.StartDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(止)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.EndDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </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-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="是否分包">
-                    <!-- SubPackage -->
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage"
-                               style="width: 100%">
+                    <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-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-import/_opera/operation.vue

@@ -27,7 +27,7 @@
                class="fromClass web_fromclass">
         <el-row>
           <el-col :span="8">
-            <el-form-item label="项目类别" prop="ContractClass">
+            <el-form-item label="企业类别" prop="ContractClass">
               <el-select v-model="formData.ContractClass" placeholder="请选择" style="width: 100%" @change="onSelectType">
                 <el-option label="供应商" value="01" key="01"></el-option>
                 <el-option label="承包商" value="02" key="02"></el-option>
@@ -44,38 +44,46 @@
               </el-select>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
-            <el-form-item label="项目名称">
-              <el-input v-model="formData.ProjectName" placeholder="请输入" style="width: 100%"></el-input>
+            <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="项目名称">-->
+<!--              <el-input v-model="formData.ProjectName" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </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 label="合同类别" prop="ClassName">
+              <el-input v-model="formData.ClassName" placeholder="请输入" style="width: 100%"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="8">
-            <el-form-item label="合同状态" prop="Status">
-              <el-select v-model="formData.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 label="合同名称" prop="ContractName">
+              <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="SettleStatus">
-              <el-select v-model="formData.SettleStatus" placeholder="请选择" style="width: 100%">
-                <el-option label="未结算" value="1" key="1"></el-option>
-                <el-option label="阶段性结算" value="2" key="2"></el-option>
-              </el-select>
+            <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="SettleStatus">-->
+<!--              <el-select v-model="formData.SettleStatus" placeholder="请选择" style="width: 100%">-->
+<!--                <el-option label="未结算" value="1" key="1"></el-option>-->
+<!--                <el-option label="阶段性结算" value="2" key="2"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -88,17 +96,30 @@
               <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="ProjectType">
-              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">
-                <el-option :label="item.Key" :value="item.Key" v-for="(item,index) of dictionary.ProjectType"
-                           :key="index"></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="ProjectType">-->
+<!--              <el-select v-model="formData.ProjectType" placeholder="请选择" style="width: 100%">-->
+<!--                <el-option :label="item.Key" :value="item.Key" v-for="(item,index) of dictionary.ProjectType"-->
+<!--                           :key="index"></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
         </el-row>
         <el-row>
+          <el-col :span="8">
+            <el-form-item label="合同状态" prop="Status">
+              <el-select v-model="formData.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="合同模式" prop="ContractMode">
               <el-input v-model="formData.ContractMode" placeholder="请输入" style="width: 100%"></el-input>
@@ -113,13 +134,7 @@
             </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>
+
         </el-row>
         <el-row>
           <el-col :span="8">
@@ -150,34 +165,18 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
-            <el-form-item label="用章名称" prop="SealName">
-              <el-input v-model="formData.SealName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="PO编码">
-              <el-input v-model="formData.PoNumber" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="用章名称" prop="SealName">-->
+<!--              <el-input v-model="formData.SealName" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="PO编码">-->
+<!--              <el-input v-model="formData.PoNumber" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <!-- 新加的 -->
-          <el-col :span="8">
-            <el-form-item label="合同名称" prop="ContractName">
-              <el-input v-model="formData.ContractName" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="合同子类" prop="ContractSonClass">
-              <el-input v-model="formData.ContractSonClass" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="相应小类">
-              <el-input v-model="formData.SmallClass" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
+
           <el-col :span="8">
             <el-form-item label="签订日期" prop="SignedDate">
               <el-date-picker
@@ -187,139 +186,149 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-<!--          <el-col :span="8">-->
-<!--            <el-form-item label="相对人" prop="People">-->
-<!--              <el-input v-model="formData.People" 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="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="ChooseWay">
-              <el-input v-model="formData.ChooseWay" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="合同标的" prop="ContractMark">
-              <el-input v-model="formData.ContractMark" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="币种" prop="Currency">
-              <el-select v-model="formData.Currency"
-                         placeholder="请选择"
-                         style="width: 100%;">
-                <el-option v-for="item in dictionary.CurrencyType"
-                           :key="item.Value"
-                           :label="item.Key"
-                           :value="item.Value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="预算金额" prop="BudgetAmount">
-              <el-input v-model="formData.BudgetAmount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="履行金额" prop="PerformAmount">
-              <el-input v-model="formData.PerformAmount" placeholder="请输入" style="width: 100%">
-                <template slot="append">(元)</template>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="是否内部合同" prop="IsInternal">
-              <el-select placeholder="请选择" v-model="formData.IsInternal" 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-col :span="8">
-            <el-form-item label="是否涉外合同" prop="IsForeign">
-              <el-select placeholder="请选择" v-model="formData.IsForeign" 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="是否关联交易" prop="IsDeal">
-              <el-select placeholder="请选择" v-model="formData.IsDeal" 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-col :span="8">
-            <el-form-item label="资金流向" prop="MoneyFlows">
-              <el-input v-model="formData.MoneyFlows" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="资金渠道" prop="MoneyChannel">
-              <el-input v-model="formData.MoneyChannel" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="资金渠道子类" prop="MoneyChannelSon">
-              <el-input v-model="formData.MoneyChannelSon" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="资金渠道小类">
-              <el-input v-model="formData.MoneyChannelSmall" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="签约单位" prop="SingUnit">
-              <el-input v-model="formData.SingUnit" 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 v-model="formData.Place" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="纠纷解决方式" prop="DisputeResolution">
-              <el-input v-model="formData.DisputeResolution" placeholder="请输入" style="width: 100%"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="提交日期" prop="SubmitDate">
-              <el-date-picker
-                v-model="formData.SubmitDate"
-                type="date"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="合同子类" prop="ContractSonClass">-->
+<!--              <el-input v-model="formData.ContractSonClass" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="相应小类">-->
+<!--              <el-input v-model="formData.SmallClass" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="相对人" prop="People">-->
+<!--              <el-input v-model="formData.People" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          -->
+
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="选商方式" prop="ChooseWay">-->
+<!--              <el-input v-model="formData.ChooseWay" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="合同标的" prop="ContractMark">-->
+<!--              <el-input v-model="formData.ContractMark" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="币种" prop="Currency">-->
+<!--              <el-select v-model="formData.Currency"-->
+<!--                         placeholder="请选择"-->
+<!--                         style="width: 100%;">-->
+<!--                <el-option v-for="item in dictionary.CurrencyType"-->
+<!--                           :key="item.Value"-->
+<!--                           :label="item.Key"-->
+<!--                           :value="item.Value">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="预算金额" prop="BudgetAmount">-->
+<!--              <el-input v-model="formData.BudgetAmount" placeholder="请输入" style="width: 100%">-->
+<!--                <template slot="append">(元)</template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="履行金额" prop="PerformAmount">-->
+<!--              <el-input v-model="formData.PerformAmount" placeholder="请输入" style="width: 100%">-->
+<!--                <template slot="append">(元)</template>-->
+<!--              </el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="是否内部合同" prop="IsInternal">-->
+<!--              <el-select placeholder="请选择" v-model="formData.IsInternal" 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-col :span="8">-->
+<!--            <el-form-item label="是否涉外合同" prop="IsForeign">-->
+<!--              <el-select placeholder="请选择" v-model="formData.IsForeign" 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="是否关联交易" prop="IsDeal">-->
+<!--              <el-select placeholder="请选择" v-model="formData.IsDeal" 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-col :span="8">-->
+<!--            <el-form-item label="资金流向" prop="MoneyFlows">-->
+<!--              <el-input v-model="formData.MoneyFlows" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="资金渠道" prop="MoneyChannel">-->
+<!--              <el-input v-model="formData.MoneyChannel" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
+<!--        <el-row>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="资金渠道子类" prop="MoneyChannelSon">-->
+<!--              <el-input v-model="formData.MoneyChannelSon" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="资金渠道小类">-->
+<!--              <el-input v-model="formData.MoneyChannelSmall" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="签约单位" prop="SingUnit">-->
+<!--              <el-input v-model="formData.SingUnit" 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 v-model="formData.Place" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="纠纷解决方式" prop="DisputeResolution">-->
+<!--              <el-input v-model="formData.DisputeResolution" placeholder="请输入" style="width: 100%"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :span="8">-->
+<!--            <el-form-item label="提交日期" prop="SubmitDate">-->
+<!--              <el-date-picker-->
+<!--                v-model="formData.SubmitDate"-->
+<!--                type="date"-->
+<!--                placeholder="选择日期">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
         <el-row v-if="formData.ContractClass == '02'">
           <el-col :span="8">
             <el-form-item label="建设单位" prop="ConstructionUnit">
@@ -604,9 +613,9 @@ export default {
         // ProjectPlace:[
         //   { required: true, message: '请输入工程地点', trigger: 'blur' },
         // ],
-        // ProjectOwner:[
-        //   { required: true, message: '请输入项目负责人', trigger: 'blur' },
-        // ],
+        ProjectOwner:[
+          { required: true, message: '请输入项目负责人', trigger: 'blur' },
+        ],
         // Telephone:[
         //   { required: true, message: '请输入联系人电话', trigger: 'blur' },
         //   { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不对' }
@@ -620,6 +629,9 @@ export default {
         SubPackage: [
           {required: true, message: '请选择是否分包', trigger: 'change'}
         ],
+        Status: [
+          {required: true, message: '请选择合同状态', trigger: 'change'}
+        ],
 
         StartDate: [
           {required: true, message: '请选择时间', trigger: 'change'},
@@ -711,6 +723,9 @@ export default {
         ContractName: [
           {required: true, message: '请输入', trigger: 'blur'}
         ],
+        ClassName: [
+          {required: true, message: '请输入', trigger: 'blur'}
+        ],
         Telephone: [
           // { required: true, message: '请输入联系人电话', trigger: 'blur' },
           {pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不对'}

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

@@ -58,7 +58,7 @@
                 <el-button type="primary" size="mini" @click="saveEntity">保存</el-button>
               </span> -->
             </div>
-            <el-form label-width="110px" ref="EntityForm" :model="formData">
+            <el-form label-width="110px" ref="EntityForm" :model="contractData" >
               <el-row>
                 <el-col :span="8">
                   <el-form-item label="服务商名称">
@@ -68,56 +68,128 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="服务项目名称">
-                    <el-input :disabled="disabled" v-model="contractData.ProjectName" placeholder="请输入"
+                  <el-form-item label="合同编号">
+                    <el-input :disabled="disabled" v-model="contractData.ContractNo" 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.ProjectPlace" placeholder="请输入"
+                  <el-form-item label="合同名称">
+                    <el-input :disabled="disabled" v-model="contractData.ContractName" 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="请输入"
-                              style="width: 100%"></el-input>
+                  <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.ProjectOwner" placeholder="请输入"
-                              style="width: 100%"></el-input>
+                  <el-form-item  label="合同总金额" >
+                    <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <template slot="append">(元)</template>
+                    </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-form-item label="签订日期">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.SignedDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+              <el-row>
+                <el-col :span="8">
+                  <el-form-item label="合同总工期">
+                    <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" @change="dateChange" style="width: 100%">
+                      <template slot="append">(天)</template>
+                    </el-input>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(始)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.StartDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </el-form-item>
+                </el-col>
+                <el-col :span="8">
+                  <el-form-item label="履行期限(止)">
+                    <el-date-picker
+                      style="width: 100%"
+                      v-model="contractData.EndDate"
+                      type="date"
+                      :disabled="disabled"
+                      placeholder="选择日期">
+                    </el-date-picker>
+                  </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-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="是否分包">
-                    <!-- SubPackage -->
-                    <el-select :disabled="disabled" placeholder="请选择" v-model="contractData.SubPackage"
-                               style="width: 100%">
+                    <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-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>