前端gjy

src/views/contractManagement/salesContract.vue

@@ -129,9 +129,16 @@
       <el-table-column prop="seller" label="卖方"> </el-table-column>
       <el-table-column prop="imperfectGrain" label="已完成（吨）">
         <template slot-scope="scope">
-          <span style="color: #5473e8; font-weight: 600">{{
-            scope.row.imperfectGrain
-          }}</span>
+          <span
+            v-if="scope.row.proportion > 90"
+            style="color: #5473e8; font-weight: 600"
+            >{{ scope.row.imperfectGrain }}</span
+          >
+          <span
+            v-if="scope.row.proportion > 90"
+            style="color: red; font-weight: 600"
+            >{{ scope.row.imperfectGrain }}</span
+          >
         </template>
       </el-table-column>
       <el-table-column prop="status" label="状态">
@@ -462,6 +469,14 @@ export default {
             } else {
               response.records[i].addressUrlArray = []
             }
+            if (response.records[i].imperfectGrain != null) {
+              response.records[i].proportion =
+                Math.floor(
+                  (response.records[i].imperfectGrain / weight) * 10000
+                ) / 100
+            } else {
+              response.records[i].proportion = 0
+            }
           }
           this.deptCircularPage.currentPage = response.current
           this.deptCircularPage.pageSize = response.size

src/views/contractManagement/salesContractAdd.vue

@@ -238,12 +238,9 @@
             prop="deliveryDateStart"
           >
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateStart"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期（起）"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -266,12 +263,9 @@
           <!--交货日期（止）-->
           <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateEnd"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期（止）"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -289,12 +283,9 @@
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.signingDate"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>

src/views/contractManagement/salesContractEdit.vue

@@ -228,12 +228,9 @@
             prop="deliveryDateStart"
           >
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateStart"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期（起）"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -249,12 +246,9 @@
           <!--交货日期（止）-->
           <ws-form-item label="交货日期（止）" span="1" prop="deliveryDateEnd">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.deliveryDateEnd"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择交货日期（止）"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>
@@ -271,12 +265,9 @@
           <!--签订日期-->
           <ws-form-item label="签订日期" span="1" prop="signingDate">
             <ws-date-picker
-              :picker-options="pickerBeginDateBefore"
               v-model="deptBudgetList.signingDate"
               type="date"
-              default-value="1980-01-01"
-              placeholder="起始日期"
-              format="yyyy-MM-dd"
+              placeholder="请选择合同签订日期"
               value-format="yyyy-MM-dd"
             />
           </ws-form-item>