Merge branch 'feature/Feature_loginPage' into develop

# Conflicts:
#	src/views/basic_data/material/price_list.vue

src/views/basic_data/material/components/modify_list-apply.vue

@@ -21,32 +21,32 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价业务员">
-              <el-select
-                placeholder="请选择调价业务员"
-                filterable
-                @change="handleUser"
-                v-model="serviceId"
-              >
-                <el-option
-                  v-for="(item, index) in userList"
-                  :label="item.nickName"
-                  :value="item.roleId"
-                  :key="index"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="调价部门">
-              <el-input
-                placeholder="调价部门"
-                disabled
-                v-model="adminCompanyName"
-              ></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="调价业务员">-->
+<!--              <el-select-->
+<!--                placeholder="请选择调价业务员"-->
+<!--                filterable-->
+<!--                @change="handleUser"-->
+<!--                v-model="serviceId"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="(item, index) in userList"-->
+<!--                  :label="item.nickName"-->
+<!--                  :value="item.roleId"-->
+<!--                  :key="index"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="调价部门">-->
+<!--              <el-input-->
+<!--                placeholder="调价部门"-->
+<!--                disabled-->
+<!--                v-model="adminCompanyName"-->
+<!--              ></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 <!--          <el-col :xs="24" :sm="12" :lg="6">-->
 <!--            <el-form-item label="销售类型">-->
 <!--              <el-select-->

src/views/basic_data/material/components/modify_list-approval.vue

@@ -295,9 +295,10 @@ export default {
     onSubmit() {
 
       const params = {
-        ...this.detail
+        ...this.detail,
 
       };
+        params.examineResult = params.examineResult == "通过" ? true : false ;
       getProductRriceConfirm(params).then((res) => {
         this.$successMsg("已提交审核");
       });

src/views/basic_data/material/modify_list.vue

@@ -108,7 +108,7 @@
             <el-table-column
               align="center"
               label="单据号"
-              prop="billId"
+              prop="updPriceBillId"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -130,14 +130,14 @@
             <el-table-column
               align="center"
               label="产品品类"
-              prop="productCategory"
+              prop="mainName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="存货编码"
-              prop="billId"
+              prop="materialNumber"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -158,7 +158,7 @@
             <el-table-column
               align="center"
               label="计量单位"
-              prop="baseUnitId"
+              prop="unit"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -220,21 +220,21 @@
             <el-table-column
               align="center"
               label="调价部门"
-              prop="modifyPriceDepartment"
+              prop="adminWebsitName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="调价业务员"
-              prop="operatorName"
+              prop="serviceName"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
             <el-table-column
               align="center"
               label="制单日期"
-              prop="preparationDate"
+              prop="createTime"
               min-width="160"
               show-overflow-tooltip
             ></el-table-column>
@@ -291,13 +291,13 @@
                 <el-button
                   type="text"
                   class="textColor"
-                  @click="approvalFn(scope.row.id)"
+                  @click="approvalFn(scope.row.updPriceBillId)"
                   >审批</el-button
                 >
                 <el-button
                   type="text"
                   class="textColor"
-                  @click="detailFn(scope.row.id)"
+                  @click="detailFn(scope.row.updPriceBillId)"
                   >详情</el-button
                 >
               </template>

src/views/basic_data/material/price_list.vue

@@ -119,14 +119,14 @@
           <el-table-column
             align="center"
             label="存货编码"
-            prop="number"
+            prop="materialNumber"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
             label="存货名称"
-            prop="name"
+            prop="materialName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
@@ -140,42 +140,28 @@
           <el-table-column
             align="center"
             label="销售类型"
-            prop="saleTypeId"
+            prop="saleTypeName"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
           <el-table-column
             align="center"
-            label="单位"
-            prop="company"
+            label="主计量单位名称"
+            prop="unit"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>
-          <!-- <el-table-column
+          <el-table-column
             align="center"
             label="数量下限"
             prop="qty"
             min-width="160"
             show-overflow-tooltip
-          ></el-table-column> -->
-          <el-table-column
-            align="center"
-            label="返利类型"
-            prop="walletRebateName"
-            min-width="160"
-            show-overflow-tooltip
           ></el-table-column>
-           <el-table-column
-            align="center"
-            label="格力折扣"
-            prop="discAmount"
-            min-width="160"
-            show-overflow-tooltip
-          ></el-table-column>
-           <el-table-column
+          <el-table-column
             align="center"
-            label="现金钱包"
-            prop="walletRebateName"
+            label="返利比例"
+            prop="rebateUseRate"
             min-width="160"
             show-overflow-tooltip
           ></el-table-column>