前端

src/views/contractManagement/purchaseContractAdd.vue

@@ -66,16 +66,17 @@
         <!-- 补充协议编号 -->
         <ws-form-item v-show="deptBudgetList.agreementType == '补充协议'" label="补充协议编号" span="1" prop="contractNo">
           <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入补充协议编号" maxlength="100" size="small" />
+        </ws-form-item>
+         <!--合同编号-->
+        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
+          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
         </ws-form-item>
         <!--运输方式-->
         <ws-form-item label="运输方式" span="1" prop="shippingType">
           <ws-input v-model="deptBudgetList.shippingType" placeholder="请输入运输方式" maxlength="100" size="small" />
         </ws-form-item>
 
-        <!--合同编号-->
-        <ws-form-item label="合同编号" span="1" prop="contractNo" class="readonly" required v-show="deptBudgetList.agreementType =='采购合同'">
-          <ws-input v-model="deptBudgetList.contractNo" placeholder="请输入合同编号" maxlength="50" size="small" />
-        </ws-form-item>
+       
         <ws-form-item label="交易主体" span="1" prop="transactionSubject" class="readonly">
           <el-radio v-model="deptBudgetList.transactionSubject" label="自营">自营</el-radio>
           <el-radio v-model="deptBudgetList.transactionSubject" label="合营">合营</el-radio>

src/views/profitable/contractprofitsdetails.vue

@@ -11,14 +11,15 @@
     </el-row>
     <div class="center">
       <el-row style='margin-bottom:10px;'>
-        <el-col :span="12">
+        <el-col :span="6">
           <!-- <el-button style="margin-left:10px" @click="typeChange('')" type="primary">导出</el-button> -->
         </el-col>
-        <el-col :span="12">
+        <el-col :span="18">
           <div style='margin-left:10px;' class="datascreen">
-            <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
+            <div style="display:inline-block;width:50;">
+              <el-date-picker value-format='yyyy-MM-dd' v-model="value" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" class="data_css" @change="changeDate" >
-            </el-date-picker>
+            </el-date-picker></div>
             <el-input placeholder="可按合同编号、买方名称、卖方名称查找" class="input_css" v-model="searchKeyWord"></el-input>
             <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
@@ -81,16 +82,16 @@
           </el-table-column>
           <el-table-column prop="buyer" label="买方/收购方"></el-table-column>
           <el-table-column prop="seller" label="卖方/合营方"></el-table-column>
-          <el-table-column prop="surplus" label="剩余（吨）">
+          <el-table-column width="120" prop="surplus" label="剩余（吨）">
              <template slot-scope="scope">
               <span v-if='scope.row.agreementType=="销售合同"'>-</span>
               <span v-else>{{scope.row.surplus}}</span>
             </template>
           </el-table-column>
-          <el-table-column prop="profit" label="利润（万元）">
+          <el-table-column width="120" prop="profit" label="利润（万元）">
           </el-table-column>
-          <el-table-column prop="status" label="状态"></el-table-column>
-          <el-table-column prop="signingDate" label="签订日期"></el-table-column>
+          <el-table-column width="80" prop="status" label="状态"></el-table-column>
+          <el-table-column width="100" prop="signingDate" label="签订日期"></el-table-column>
           <el-table-column prop="address" label="操作" width="300">
             <template slot-scope="scope">
               <el-button v-if="scope.row.status=='已结算'" @click="finalstatement(scope.row)" type="primary">结算单</el-button>
@@ -499,4 +500,7 @@
   .bg-right{
     padding-top:15px;
   }
+  .el-icon-connection{
+    color:#409eff;
+  }
 </style>