Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/contractManagement/purchaseContract.vue

@@ -42,7 +42,7 @@
       </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
-      <el-table-column prop="grade" label="品级" width="80">
+      <!-- <el-table-column prop="grade" label="品级" width="80">
         <template slot-scope="scope">
           <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
             scope.row.grade
@@ -57,11 +57,11 @@
             scope.row.grade
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
       <el-table-column prop="unitContractPrice" label="合同单价（元）">
       </el-table-column>
-      <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+      <!-- <el-table-column prop="packingMethod" label="包装方式"> </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="completedQuantity" label="已完成（吨）">
@@ -108,8 +108,12 @@
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column prop="contractExpenditure" label="合同支出"> </el-table-column>
+      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
+      
       <el-table-column prop="mildewGrain" label="已付款（元）">
       </el-table-column>
+      <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
       <el-table-column prop="goodsNames" label="已开发票 （元）">
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">

src/views/contractManagement/salesContract.vue

@@ -44,7 +44,7 @@
       </el-table-column>
       <el-table-column prop="goodsName" label="货名" width="80">
       </el-table-column>
-      <el-table-column prop="grade" label="品级" width="80">
+      <!-- <el-table-column prop="grade" label="品级" width="80">
         <template slot-scope="scope">
           <span v-if="scope.row.grade == '一等品'" class="top-grade">{{
             scope.row.grade
@@ -59,11 +59,11 @@
             scope.row.grade
           }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="weight" label="重量（吨）"> </el-table-column>
       <el-table-column prop="unitContractPrice" label="合同单价（元）">
       </el-table-column>
-      <el-table-column prop="packingMethod" label="包装方式"> </el-table-column>
+      <!-- <el-table-column prop="packingMethod" label="包装方式"> </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="completedQuantity" label="已完成（吨）">
@@ -110,9 +110,16 @@
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>
+      <el-table-column prop="contractRevenue" label="合同收入"> </el-table-column>
+      <el-table-column prop="expenses" label="费用支出"> </el-table-column>
       <el-table-column prop="mildewGrain" label="未回款（元）">
+        <template slot-scope="scope">
+        <span style='color:red;' v-if='scope.row.datestatus&&scope.row.invoiced>scope.row.contractRevenue'>{{scope.row.mildewGrain}}</span>
+        <span v-else>{{scope.row.mildewGrain}}</span>
+        </template>
       </el-table-column>
-      <el-table-column prop="goodsNames" label="已开发票 （元）">
+      <el-table-column prop="amountEdPayable" label="已付运费"> </el-table-column>
+      <el-table-column width='120' prop="goodsNames" label="已开发票 （元）">
       </el-table-column>
       <el-table-column prop="addressUrl" label="附件">
         <template slot-scope="scope">
@@ -309,6 +316,7 @@
             },
           ],
         },
+        currentDate:0,
         value1: '',
         value2: '',
       }
@@ -382,6 +390,7 @@
       },
 
       getList() {
+        
         getList({
             compId: localStorage.getItem('ws-pf_compId'),
             contractType: this.contractType,
@@ -396,7 +405,20 @@
           })
           .toPromise()
           .then((response) => {
+            var date=new Date().getTime()
             for (var i = 0; i < response.records.length; i++) {
+              if(response.records[i].collectionDeadline){
+                response.records[i].date=new Date(response.records[i].collectionDeadline).getTime()
+                console.log(response.records[i].date,parseInt(date) + (5 * 24 * 3600 * 1000))
+                if(response.records[i].date<parseInt(date) + (5 * 24 * 3600 * 1000)){
+                  response.records[i].datestatus=true
+                }
+              }else{
+                response.records[i].datestatus=false
+              }
+              
+              
+              
               if (response.records[i].completedQuantity) {
                 response.records[i].completedQuantity = response.records[i].completedQuantity.toFixed(3)
               }

src/views/contractManagement/salesContractAdd.vue

@@ -233,6 +233,10 @@
             <ws-input v-model="deptBudgetList.finalTradingVolume" placeholder="请输入最终实际成交量" maxlength="100"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="收款截止日期" span="1" prop="collectionDeadline">
+            <ws-date-picker v-model="deptBudgetList.collectionDeadline" type="date" placeholder="请选择收款截止日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
         </ws-info-table>
       </ws-form>
     </div>

src/views/contractManagement/salesContractEdit.vue

@@ -242,6 +242,10 @@
             <ws-input v-model="deptBudgetList.finalTradingVolume" maxlength="100" placeholder="请输入最终实际交易量"
               size="small" />
           </ws-form-item>
+          <ws-form-item label="收款截止日期" span="1" prop="collectionDeadline">
+            <ws-date-picker v-model="deptBudgetList.collectionDeadline" type="date" placeholder="请选择收款截止日期"
+              value-format="yyyy-MM-dd" />
+          </ws-form-item>
         </ws-info-table>
       </ws-form>
     </div>