前:样式

src/dashoo.cn/frontend_web/src/components/oilcontract/contractSelect.vue

@@ -23,9 +23,17 @@
               </div>
               <el-form label-width="110px" ref="EntityForm" :model="contractData" >
                 <el-row>
-                  <el-col :span="8">
+                  <el-col :span="16">
                     <el-form-item label="服务商名称">
-                      <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                      <el-input readonly v-model="contractData.SupplierName" placeholder="请输入"
+                                style="width: 100%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="16">
+                    <el-form-item label="合同名称">
+                      <el-input readonly v-model="contractData.ContractName" placeholder="请输入"
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
@@ -33,87 +41,67 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="合同编号">
-                      <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
+                      <el-input readonly 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.ClassName" placeholder="请输入"
+                      <el-input readonly 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="请输入"
-                                style="width: 100%"></el-input>
+                    <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-row>
                 <el-row>
                   <el-col :span="8">
                     <el-form-item  label="合同总金额" >
-                      <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <el-input readonly 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-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                      <el-input readonly 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 label="报审序号">
+                      <el-input readonly v-model="contractData.Number" 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
                         style="width: 100%"
                         v-model="contractData.SignedDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </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">
-                    <el-form-item label="合同总工期">
-                      <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" 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"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -124,7 +112,7 @@
                         style="width: 100%"
                         v-model="contractData.EndDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -133,7 +121,7 @@
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="备注">
-                      <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                      <el-input type="textarea" readonly v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -334,9 +322,17 @@
               </div>
               <el-form label-width="110px" ref="EntityForm" :model="contractData" >
                 <el-row>
-                  <el-col :span="8">
+                  <el-col :span="16">
                     <el-form-item label="承包商名称">
-                      <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                      <el-input readonly v-model="contractData.SupplierName" placeholder="请输入"
+                                style="width: 100%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="16">
+                    <el-form-item label="合同名称">
+                      <el-input readonly v-model="contractData.ContractName" placeholder="请输入"
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
@@ -344,87 +340,67 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="合同编号">
-                      <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
+                      <el-input readonly 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.ClassName" placeholder="请输入"
+                      <el-input readonly 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="请输入"
-                                style="width: 100%"></el-input>
+                    <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-row>
                 <el-row>
                   <el-col :span="8">
                     <el-form-item  label="合同总金额" >
-                      <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <el-input readonly 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-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                      <el-input readonly 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 label="报审序号">
+                      <el-input readonly v-model="contractData.Number" 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
                         style="width: 100%"
                         v-model="contractData.SignedDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </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">
-                    <el-form-item label="合同总工期">
-                      <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" 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"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -435,7 +411,7 @@
                         style="width: 100%"
                         v-model="contractData.EndDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -444,13 +420,14 @@
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="备注">
-                      <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                      <el-input type="textarea" readonly v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
                 </el-row>
               </el-form>
 
 
+
             </el-card>
           </el-tab-pane>
           <el-tab-pane label="业绩评价" name="2">
@@ -712,9 +689,17 @@
               </div>
               <el-form label-width="110px" ref="EntityForm" :model="contractData" >
                 <el-row>
-                  <el-col :span="8">
+                  <el-col :span="16">
                     <el-form-item label="供应商名称">
-                      <el-input :disabled="disabled" v-model="contractData.SupplierName" placeholder="请输入"
+                      <el-input readonly v-model="contractData.SupplierName" placeholder="请输入"
+                                style="width: 100%"></el-input>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row>
+                  <el-col :span="16">
+                    <el-form-item label="合同名称">
+                      <el-input readonly v-model="contractData.ContractName" placeholder="请输入"
                                 style="width: 100%"></el-input>
                     </el-form-item>
                   </el-col>
@@ -722,87 +707,67 @@
                 <el-row>
                   <el-col :span="8">
                     <el-form-item label="合同编号">
-                      <el-input :disabled="disabled" v-model="contractData.ContractNo" placeholder="请输入"
+                      <el-input readonly 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.ClassName" placeholder="请输入"
+                      <el-input readonly 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="请输入"
-                                style="width: 100%"></el-input>
+                    <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-row>
                 <el-row>
                   <el-col :span="8">
                     <el-form-item  label="合同总金额" >
-                      <el-input :disabled="disabled" v-model="contractData.Amount" placeholder="请输入" style="width: 100%">
+                      <el-input readonly 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-input :disabled="disabled" v-model="contractData.ProjectOwner" placeholder="请输入"
+                      <el-input readonly 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 label="报审序号">
+                      <el-input readonly v-model="contractData.Number" 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
                         style="width: 100%"
                         v-model="contractData.SignedDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </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">
-                    <el-form-item label="合同总工期">
-                      <el-input :disabled="disabled" v-model="contractData.ContractPeriod" placeholder="请输入" 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"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -813,7 +778,7 @@
                         style="width: 100%"
                         v-model="contractData.EndDate"
                         type="date"
-                        :disabled="disabled"
+                        readonly
                         placeholder="选择日期">
                       </el-date-picker>
                     </el-form-item>
@@ -822,13 +787,14 @@
                 <el-row>
                   <el-col :span="24">
                     <el-form-item label="备注">
-                      <el-input type="textarea" v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
+                      <el-input type="textarea" readonly v-model="contractData.Remark" placeholder="请输入" style="width: 100%"></el-input>
                     </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-select/index.vue

@@ -84,7 +84,7 @@
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"
-                         v-if="column.prop == 'CreateBy'"  :min-width="100" :label="column.label" align="center" show-overflow-tooltip>
+                         v-if="column.prop == 'CreateBy'"  :min-width="100" :prop="column.prop" :label="column.label" sortable align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             <div>{{ scope.row[column.prop] }}</div>
           </template>
@@ -422,7 +422,7 @@ export default {
           prop: 'CreateBy',
           label: '创建人',
           width: 100,
-          sort: false
+          sort: true
         },
 
         {