Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceDaiBanInfo.vue

@@ -101,7 +101,7 @@
             </el-table-column>
             <el-table-column label="买断状态" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.settlementStatusValue }}<span>({{ scope.row.vehicleNum }})</span></span>
+                <span>{{ scope.row.settlementStatusValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="厂家结算价" align="center" width="150">

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceEdit.vue

@@ -73,7 +73,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-date-picker v-model="temp.effectiveDate" type="date" class="addinputw" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+                <el-date-picker v-model="temp.effectiveDate" type="date" class="addinputw" :picker-options="pickerOptions" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -160,6 +160,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now()
+        }
+      },
       viewTitle: '',
       viewState: 1,
       tableKey: 0,

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/xiaoshouzhengceYiBanInfo.vue

@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="买断状态" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.settlementStatusValue }}<span>({{ scope.row.vehicleNum }})</span></span>
+                <span>{{ scope.row.settlementStatusValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="厂家结算价" align="center" width="150">

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshourangjia/xiaoshourangjiaguanli.vue

@@ -8,7 +8,7 @@
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
               <el-form-item label="分公司">
-                <el-select v-model="listQuery.params.orgSid" placeholder="请选择" filterable @change="orgChange">
+                <el-select v-model="listQuery.params.useOrgSid" placeholder="请选择" filterable @change="orgChange">
                   <el-option v-for="item in userOrg_list" :key="item.sid" :label="item.name" :value="item.sid">
                   </el-option>
                 </el-select>
@@ -111,7 +111,7 @@ export default {
         params: {
           orgSidPath: '',
           brandSid: '',
-          orgSid: ''
+          useOrgSid: ''
         }
       }
     }
@@ -187,7 +187,7 @@ export default {
         params: {
           orgSidPath: '',
           brandSid: '',
-          orgSid: ''
+          useOrgSid: ''
         }
       }
       this.getList()

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceAdd.vue

@@ -74,7 +74,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-date-picker v-model="temp.effectiveDate" type="date" class="addinputw" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
+                <el-date-picker v-model="temp.effectiveDate" type="date" class="addinputw" :picker-options="pickerOptions" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
               </el-form-item>
             </el-col>
             <el-col :span="4" class="tleftb">
@@ -161,6 +161,11 @@ export default {
   },
   data() {
     return {
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now()
+        }
+      },
       viewTitle: '',
       viewState: 1,
       tableKey: 0,

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengceInfo.vue

@@ -99,7 +99,7 @@
             </el-table-column>
             <el-table-column label="买断状态" align="center" width="150">
               <template slot-scope="scope">
-                <span>{{ scope.row.settlementStatusValue }}<span>({{ scope.row.vehicleNum }})</span></span>
+                <span>{{ scope.row.settlementStatusValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="厂家结算价" align="center" width="150">

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplication.vue

@@ -33,9 +33,9 @@
         <!-- Start 项目列表 -->
         <div class="">
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="handleSelectionChange">
-            <el-table-column width="50px" type="selection" align="center"/>
-            <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column width="150px" label="操作" align="center">
+            <el-table-column fixed width="50px" type="selection" align="center"/>
+            <el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
+            <el-table-column fixed width="150px" label="操作" align="center">
               <template slot-scope="scope">
                 <el-button v-if="scope.row.nodeState=='待提交'||(scope.row.nodeState!='待提交'&&scope.row.nodeState=='发起申请')" type="primary" size="mini" @click="toEdit(scope.row)">办理
                 </el-button>
@@ -51,6 +51,7 @@
             </el-table-column>
             <el-table-column prop="applicationCode" width="200px;" label="申请编号" align="center"/>
             <el-table-column prop="applicationDate" width="110px;" label="申请日期" align="center"/>
+            <el-table-column prop="useOrgName" width="200px;" label="分公司" align="center"/>
             <el-table-column prop="modelName" label="车型" align="center"/>
             <el-table-column prop="num" width="100px;" label="台数" align="center"/>
             <el-table-column prop="purchasePrice" width="90px;" label="采购价格" align="center"/>

anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue

@@ -560,6 +560,9 @@ export default {
       this.formobj.applicationDate = dayDate
       this.formobj.createByName = window.sessionStorage.getItem('name')
       this.formobj.contract = {}
+      this.formobj.isSaleOrgApproval = '1'
+      this.formobj.isBeforePayment = '0'
+      this.formobj.manufactorSettlementPrice = '0'
       this.fileList = []
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()