完善专项返利待核对 -- 调整页面增加部分内容

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

@@ -57,8 +57,14 @@
         </div>
         <div class="">
           <el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
-            <el-table-column fixed type="selection" align="center" width="50px"/>
-            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
+            <el-table-column fixed type="selection" align="center" width="50"/>
+            <el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
+                <el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
+              </template>
+            </el-table-column>
             <el-table-column label="上传状态" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
@@ -88,12 +94,6 @@
             <el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
             <el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
             <el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="300" />
-            <el-table-column label="操作" align="center" width="180px">
-              <template slot-scope="scope">
-                <el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
-                <el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
-              </template>
-            </el-table-column>
           </el-table>
         </div>
         <div class="pages">
@@ -121,8 +121,111 @@
           </div>
         </div>
         <el-form title="返利调整" ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #e0e3eb">
+            <el-col :span="8">
+              <div class="span-sty">分公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">采购系统</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">品牌</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">返利类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">返利名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">所属年月</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.palceGenDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">预计返利</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">预提日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.withholdingDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">状态</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.state == '0' ? '未计提' : formobj.state == '1' ? '计提中' : formobj.state == '2' ? '待核对' : formobj.state == '3' ? '核对中' : formobj.state == '4' ? '已核对' : formobj.state == '5' ? '分配中' : formobj.state == '6' ? '已分配' : '' }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">其中支出费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectItureCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectTreatCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectSuppCost }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.expectSuppRemark }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">一次上传</div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">上传日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">上传金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中待确定金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">其中支出费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceItureCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中待支付费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceTreatCost }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">其中抵顶费用</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceSuppCost }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">抵顶费用说明</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.onceSuppRemark }}</span></el-form-item>
+            </el-col>
+          </el-row>
           <div class="title">待确定金额分配</div>
-          <el-row style="border-top: 1px solid #E0E3EB">
+          <el-row>
             <el-col :span="24">
               <div class="span-sty">待确定金额</div>
               <el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoneyNew }}</span></el-form-item>