Merge remote-tracking branch 'origin/master'

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

@@ -58,7 +58,7 @@
             <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
             <el-table-column label="上传状态" align="center" width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.uploadState === '0' ? '未调整' : scope.row.uploadState === '1' ? '已调整' : scope.row.uploadState === '2' ? '未上传' : scope.row.uploadState === '3' ? '已上传' : ''}}</span>
+                <span>{{ scope.row.uploadState == '0' ? '未调整' : scope.row.uploadState == '1' ? '已调整' : scope.row.uploadState == '2' ? '未上传' : scope.row.uploadState == '3' ? '已上传' : ''}}</span>
               </template>
             </el-table-column>
             <el-table-column label="品牌" align="center" width="200">
@@ -142,15 +142,14 @@
               </template>
             </el-table-column>
             <el-table-column label="是否调整" align="center" width="100">
-              <template slot-scope="scope"><!--@change="changeIsAdjustment(scope.row)" -->
-                <el-select v-model="scope.row.isAdjustment" @change="changeIsAdjustment(scope.row)" placeholder="" filterable>
+              <template slot-scope="scope">
+                <el-select v-model="scope.row.isAdjustment" :disabled="scope.row.stayDetermineMoney > 0 || (scope.row.stayDetermineMoney == '0' && scope.row.adjustmentMoney == '0')" @change="changeIsAdjustment(scope.row)" placeholder="" filterable>
                   <el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"/>
                 </el-select>
               </template>
             </el-table-column>
             <el-table-column label="调整金额" align="center" width="150">
               <template slot-scope="scope">
-<!--                <el-input :disabled="scope.row.isAdjustment === '' || scope.row.isAdjustment === '否'" v-model="scope.row.adjustmentMoney" clearable placeholder=""></el-input>-->
                 <span>{{ scope.row.adjustmentMoney }}</span>
               </template>
             </el-table-column>
@@ -282,7 +281,7 @@ export default {
     Pagination,
     ButtonBar,
     bicyclerebatecheck,
-    bicyclerebatecheckAdd,
+    bicyclerebatecheckAdd
   },
   data() {
     return {

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue

@@ -54,7 +54,7 @@
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>计算标准
-                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
                 <span v-else>(元)</span>
               </span>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementEdit.vue

@@ -54,7 +54,7 @@
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>计算标准
-                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
                 <span v-else>(元)</span>
               </span>
             </el-col>

anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementInfo.vue

@@ -44,7 +44,7 @@
             </el-col>
             <el-col :span="4" class="tleftb">
               <span>计算标准
-                <span v-if="formobj.calculationModeValue == '固定金额'">(%)</span>
+                <span v-if="formobj.calculationModeValue == '比例'">(%)</span>
                 <span v-else>(元)</span>
               </span>
             </el-col>