Merge remote-tracking branch 'origin/master'

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

@@ -118,7 +118,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <div v-show="formobj.isBeforePayment == '0'">
+              <div v-if="formobj.isBeforePayment == '0'">
                 <div class="span-sty"><span class="icon">*</span>订金使用规则</div>
                 <el-form-item prop="depositUseRuleValue">
                   <el-select class="addinputInfo" v-model="formobj.depositUseRuleValue" filterable placeholder="请选择" @change="depositUseRuleChange">
@@ -217,7 +217,7 @@
             <el-col :span="24">
               <div class="span-sty">合同附件</div>
               <el-form-item>
-                <el-upload :action="uploadAction" :data="requestData" :headers="accessToken" :accept="filType" :multiple="false" :on-success="uploadSuccessHetong" :limit="1" :file-list="fileList" :on-preview='handleDown' class="upload-demo">
+                <el-upload class="addinputInfo" :action="uploadAction" :data="requestData" :headers="accessToken" :accept="filType" :multiple="false" :on-success="uploadSuccessHetong" :limit="1" :file-list="fileList" :on-preview='handleDown' class="upload-demo">
                   <el-button size="small" type="primary">合同上传</el-button>
                 </el-upload>
               </el-form-item>

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

@@ -157,11 +157,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="3" class="tleftb">
-              <span v-show="formobj.isBeforePayment == '0'"><span class="icon">*</span>订金使用规则</span>
+              <span v-if="formobj.isBeforePayment == '0'"><span class="icon">*</span>订金使用规则</span>
             </el-col>
             <el-col :span="5">
               <el-form-item prop="depositUseRuleValue">
-                <el-select v-show="formobj.isBeforePayment == '0'" v-model="formobj.depositUseRuleValue" filterable placeholder="请选择" @change="depositUseRuleChange">
+                <el-select v-if="formobj.isBeforePayment == '0'" v-model="formobj.depositUseRuleValue" filterable placeholder="请选择" @change="depositUseRuleChange">
                   <el-option v-for="item in depositUseRule_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
               </el-form-item>
@@ -327,7 +327,7 @@
                   :limit="1"
                   :file-list="fileList"
                   :on-preview='handleDown'
-                  class="upload-demo"
+                  class="upload-demo addinputw"
                 >
                   <el-button size="small" type="primary">合同上传</el-button>
                 </el-upload>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue

@@ -153,6 +153,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue

@@ -139,6 +139,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanhedui/collectionrebatecheckedAdd.vue

@@ -118,6 +118,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/manufacturerrebates/huikuanyuti/collectionrebatewithholdingAdd.vue

@@ -124,6 +124,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheckAdd.vue

@@ -152,6 +152,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatewithholding/specialrebatewithholdingAdd.vue

@@ -131,6 +131,7 @@ export default {
       let day = date.getDate() // 本日
       if (month < 1 && day < 7) {
         month = 12
+        year = date.getFullYear() - 1
       } else if (month < 1 && day > 6) {
         month = date.getMonth() + 1 // 本月
       } else if (month > 0 && day > 6) {

anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue

@@ -65,8 +65,8 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-radio v-model="formobj.isPay" label="1">是</el-radio>
-                <el-radio v-model="formobj.isPay" label="0">否</el-radio>
+                <el-radio disabled v-model="formobj.isPay" label="1">是</el-radio>
+                <el-radio disabled v-model="formobj.isPay" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>
@@ -367,6 +367,7 @@ export default {
       this.formobj.applicationName = window.sessionStorage.getItem('name')
       this.formobj.userSid = window.sessionStorage.getItem('userSid')
       this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.formobj.isPay = '0'
       this.viewTitle = '【新增】车辆未售买断申请'
     },
     showEdit(row) {

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue

@@ -64,8 +64,8 @@
             </el-col>
             <el-col :span="4">
               <el-form-item>
-                <el-radio v-model="formobj.isPay" label="1">是</el-radio>
-                <el-radio v-model="formobj.isPay" label="0">否</el-radio>
+                <el-radio disabled v-model="formobj.isPay" label="1">是</el-radio>
+                <el-radio disabled v-model="formobj.isPay" label="0">否</el-radio>
               </el-form-item>
             </el-col>
           </el-row>