Merge branch 'feature/Feature_loginPage' into develop

src/views/basic_data/material/classify_list.vue

@@ -177,7 +177,15 @@
             autocomplete="off"
             v-model="addGroupForm.productCategoryNumber"
             placeholder="请输入"
+            v-if="addGroupFormType == 'add' "
           ></el-input>
+            <el-input v-else
+              autocomplete="off"
+              v-model="addGroupForm.productCategoryNumber"
+              placeholder="请输入"
+              v-else disabled='disabled'
+            ></el-input>
+
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -474,4 +482,4 @@ export default {
     }
   }
 }
-</style>
+</style>

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

@@ -47,21 +47,21 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
-            <el-form-item label="销售类型">
-              <el-select
-                placeholder="请选择销售类型"
-                filterable
-                v-model="saleTypeId"
-              >
-                <el-option
-                  v-for="item in typeList"
-                  :label="item.saleName"
-                  :value="item.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :xs="24" :sm="12" :lg="6">-->
+<!--            <el-form-item label="销售类型">-->
+<!--              <el-select-->
+<!--                placeholder="请选择销售类型"-->
+<!--                filterable-->
+<!--                v-model="saleTypeId"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in typeList"-->
+<!--                  :label="item.saleName"-->
+<!--                  :value="item.id"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="文件编码">
               <el-input placeholder="请输入" v-model="base.remark"></el-input>

src/views/basic_data/material/material_list.vue

@@ -92,13 +92,20 @@
               label="是否维护商城资料"
               prop="maintainData"
               min-width="100"
-            ></el-table-column>
+            >
+
+            </el-table-column>
             <el-table-column
               align="center"
               label="是否维护内外机档案"
               prop="maintainFiles"
               min-width="100"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                <el-tag type="success" v-if="scope.row.isSheath==true">是</el-tag>
+                <el-tag type="danger" v-else>否</el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               align="center"
               label="基本单位"

src/views/sales_policy/components/AddCondition.vue

@@ -147,7 +147,7 @@
               v-for="(len, index) in conditionBoxs.length - 1"
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
-              {{index}}
+<!--              {{index}}-->
                 <el-input
                   size="small"
                   :readonly="!id?false:true"

src/views/sales_policy/components/Distributor.vue

@@ -142,13 +142,13 @@
         >
         </el-table-column>
         <el-table-column
-          v-if="!$store.getters.customerId"
           fixed="right"
           label="操作"
           align="center"
           width="200"
         >
-          <template slot-scope="scope">
+          <!--  v-if="!$store.getters.customerId"-->
+          <template slot-scope="scope" >
             <el-button
               type="text"
               size="small"
@@ -164,6 +164,7 @@
             >
             <!-- <el-button type="text" size="small">删除</el-button> -->
           </template>
+
         </el-table-column>
       </el-table>
       <!-- 分页 -->

src/views/sales_rebate/rebate_list.vue

@@ -192,9 +192,7 @@
           <el-form-item label="产品使用品类" prop="mainName">
             <el-input v-model="dialogForm.mainName" :readonly="true"></el-input>
           </el-form-item>
-          <el-form-item label="产品使用品类" prop="mainName">
-            <el-input v-model="dialogForm.mainName" :readonly="true"></el-input>
-          </el-form-item>
+
           <el-form-item label="返利折扣比例" prop="rebateRate">
 
            <el-input