howie 3 éve
szülő
commit
46d23effe0

+ 6 - 0
src/views/deposit_home/components/deposit_list-detail.vue

@@ -751,8 +751,14 @@ export default {
   created() {
     this.getDetail()
   },
+  component:{
+    isCustomer(){
+      return this.$store.getters.customerId && this.$store.getters.customerNumber
+    }
+  },
   methods: {
     getDetail() {
+
       if (this.engineering == '工程押金信息') {
         geDetail({ id: this.$parent.depositManageId }).then((res) => {
           this.details = res.data

+ 14 - 14
src/views/sales_policy/components/AddCondition.vue

@@ -29,14 +29,14 @@
               <el-row class="pdt">
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="(VisibleModle = true), getMaterialLists(index)"
                   >添加机型</el-button
                 >
 
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="handleDeleteRow(index)"
                   >删除机型</el-button
                 >
@@ -82,13 +82,13 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-form label-width="120px" :inline="false" size="small">
+          <el-form label-width="120px" :inline="false" size="mini">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input size="small" v-model="limit"></el-input>
+                <el-input size="mini" v-model="limit"></el-input>
               </el-form-item>
             </el-col>
 
@@ -100,7 +100,7 @@
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
-                  size="small"
+                  size="mini"
                   v-model="popArr['line_' + index]"
                 ></el-input>
               </el-form-item>
@@ -169,14 +169,14 @@
           </el-col>
         </el-row>
         <el-row v-if="conditionBoxs.length">
-          <el-form label-width="120px" :inline="false" size="small">
+          <el-form label-width="120px" :inline="false" size="mini">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
                 <el-input
-                  size="small"
+                  size="mini"
                   v-model="limit"
                   :readonly="!id ? false : true"
                 ></el-input>
@@ -191,7 +191,7 @@
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
-                  size="small"
+                  size="mini"
                   :readonly="!id ? false : true"
                   v-model="popArr['line_' + index]"
                 ></el-input>
@@ -199,7 +199,7 @@
             </el-col>
           </el-form>
           <el-col class="text_rihgt" v-if="false">
-            <el-button type="primary" size="small" @click=""
+            <el-button type="primary" size="mini" @click=""
               >添加限定条件</el-button
             ></el-col
           >
@@ -210,15 +210,15 @@
     <el-footer height="100px" v-if="!id">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="12" :offset="0">
-          <el-button type="primary" size="small" @click="handleSubmit"
+          <el-button type="primary" size="mini" @click="handleSubmit"
             >保存</el-button
           >
         </el-col>
         <el-col :xs="24" :sm="12" :lg="12" :offset="0" class="tr">
-          <el-button type="primary" size="small" @click="hanleAddModel"
+          <el-button type="primary" size="mini" @click="hanleAddModel"
             >添加</el-button
           >
-          <el-button type="primary" size="small" @click="handleresale"
+          <el-button type="primary" size="mini" @click="handleresale"
             >重置</el-button
           >
         </el-col>
@@ -228,7 +228,7 @@
       <div>
         <el-container>
           <el-header height="">
-            <el-form label-width="0" :inline="false" size="small">
+            <el-form label-width="0" :inline="false" size="mini">
               <el-col :xs="24" :sm="10" :lg="10" :offset="0">
                 <el-form-item label="">
                   <el-input
@@ -241,7 +241,7 @@
                 <el-form-item label="">
                   <el-button
                     type="primary"
-                    size="small"
+                    size="mini"
                     @click="getMaterialLists(arrIndex)"
                     >搜索</el-button
                   >

+ 18 - 18
src/views/sales_policy/components/AddPolicy.vue

@@ -15,7 +15,7 @@
             ref="form"
             :model="searchForm"
             label-width="120px"
-            size="small"
+            size="mini"
             class="demo-searchForm"
           >
             <el-row>
@@ -40,7 +40,7 @@
                 <el-form-item label="销售政策类型" prop="type">
                   <el-select
                     v-model="searchForm.type"
-                    size="small"
+                    size="mini"
                     placeholder="销售政策类型"
                     class="select_height"
                   >
@@ -121,7 +121,7 @@
                     :file-list="importFileList"
                     :show-file-list="false"
                   >
-                    <el-button type="primary" size="small"
+                    <el-button type="primary" size="mini"
                       >导入货品价格表</el-button
                     >
                   </el-upload>
@@ -129,13 +129,13 @@
 
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="hanleDownloadFiles"
                   >下载模板</el-button
                 >
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="exportGoods"
                 >导出货品</el-button
                 >
@@ -174,7 +174,7 @@
                 <el-select
                   v-model="scope.row.materialNumber"
                   v-el-select-loadmore="loadmore"
-                  size="small"
+                  size="mini"
                   :remote-method="(query) => remoteMethod(query, 'number')"
                   filterable
                   remote
@@ -213,7 +213,7 @@
 
                 <el-select
                   v-model="scope.row.specification"
-                  size="small"
+                  size="mini"
                   :remote-method="
                     (query) => remoteMethod(query, 'specification')
                   "
@@ -242,7 +242,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.saleTypeId"
-                  size="small"
+                  size="mini"
                   filterable
                   @change="handleSalesType($event, scope.row)"
                 >
@@ -270,7 +270,7 @@
                   v-model.number="scope.row.discAmount"
                   type="number"
                   placeholder="请输入格力折扣"
-                  size="small"
+                  size="mini"
                 />
               </template>
             </el-table-column>
@@ -287,7 +287,7 @@
                   v-model.number="scope.row.price"
                   type="number"
                   placeholder="请输入单价"
-                  size="small"
+                  size="mini"
                 />
               </template>
             </el-table-column>
@@ -300,7 +300,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.rebateWalletIds"
-                  size="small"
+                  size="mini"
                   multiple
                   filterable
                 >
@@ -322,7 +322,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.walletIds"
-                  size="small"
+                  size="mini"
                   multiple
                   filterable
                 >
@@ -346,7 +346,7 @@
                 <el-input
                   v-model="scope.row.remark"
                   placeholder="备注"
-                  size="small"
+                  size="mini"
                 />
               </template>
             </el-table-column>
@@ -379,10 +379,10 @@
             "
           >
             <div>
-              <el-button type="primary" size="small" @click="handleNewInfo"
+              <el-button type="primary" size="mini" @click="handleNewInfo"
                 >添加</el-button
               >
-              <el-button type="primary" size="small" @click="handleSave"
+              <el-button type="primary" size="mini" @click="handleSave"
                 >保存</el-button
               >
             </div>
@@ -404,7 +404,7 @@
                 <h4 style="display: inline-block; margin-right: 20px">
                   条件信息
                 </h4>
-                <el-button type="primary" size="small" @click="isCondition = 1"
+                <el-button type="primary" size="mini" @click="isCondition = 1"
                   >添加</el-button
                 ></el-col
               >
@@ -446,7 +446,7 @@
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="
                     scope.row.fang = false;
                     conditName = scope.row.name;
@@ -455,7 +455,7 @@
                 >
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="handleCondition(scope.row.id, scope.$index)"
                   >删除</el-button
                 >

+ 13 - 13
src/views/sales_policy/components/EditCondition.vue

@@ -25,14 +25,14 @@
               <el-row class="pdt">
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="(VisibleModle = true), getMaterialLists(index)"
                   >添加机型</el-button
                 >
 
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="handleDeleteRow(index)"
                   >删除机型</el-button
                 >
@@ -66,13 +66,13 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-form label-width="120px" :inline="false" size="small">
+          <el-form label-width="120px" :inline="false" size="mini">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
-                <el-input size="small" v-model="limit"></el-input>
+                <el-input size="mini" v-model="limit"></el-input>
               </el-form-item>
             </el-col>
 
@@ -84,7 +84,7 @@
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
-                  size="small"
+                  size="mini"
                   v-model="popArr['line_' + index]"
                 ></el-input>
               </el-form-item>
@@ -145,14 +145,14 @@
           </el-col>
         </el-row>
         <el-row v-if="conditionBoxs.length">
-          <el-form label-width="120px" :inline="false" size="small">
+          <el-form label-width="120px" :inline="false" size="mini">
             <el-row>
               <el-form-item label="配置比例设置"> </el-form-item>
             </el-row>
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="限定机型">
                 <el-input
-                  size="small"
+                  size="mini"
                   v-model="limit"
                   :readonly="!id ? false : true"
                 ></el-input>
@@ -167,7 +167,7 @@
             >
               <el-form-item :label="'配提' + (index + 1) + '比例'">
                 <el-input
-                  size="small"
+                  size="mini"
                   :readonly="!id ? false : true"
                   v-model="popArr['line_' + index]"
                 ></el-input>
@@ -175,7 +175,7 @@
             </el-col>
           </el-form>
           <el-col class="text_rihgt" v-if="false">
-            <el-button type="primary" size="small" @click=""
+            <el-button type="primary" size="mini" @click=""
               >添加限定条件</el-button
             ></el-col
           >
@@ -186,15 +186,15 @@
     <el-footer height="100px" v-if="id">
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :lg="12" :offset="0">
-          <el-button type="primary" size="small" @click="handleSubmit"
+          <el-button type="primary" size="mini" @click="handleSubmit"
             >保存</el-button
           >
         </el-col>
         <el-col :xs="24" :sm="12" :lg="12" :offset="0" class="tr">
-          <el-button type="primary" size="small" @click="hanleAddModel"
+          <el-button type="primary" size="mini" @click="hanleAddModel"
             >添加</el-button
           >
-          <el-button type="primary" size="small" @click="handleresale"
+          <el-button type="primary" size="mini" @click="handleresale"
             >重置</el-button
           >
         </el-col>
@@ -204,7 +204,7 @@
       <div>
         <el-container>
           <el-header height="">
-            <el-form label-width="0" :inline="false" size="small">
+            <el-form label-width="0" :inline="false" size="mini">
               <el-col :xs="24" :sm="8" :lg="8" :offset="0">
                 <el-form-item label="">
                   <el-input

+ 13 - 13
src/views/sales_policy/components/Examine.vue

@@ -34,7 +34,7 @@
               <div class="value">
                 <el-select
                   v-model="detail.type"
-                  size="small"
+                  size="mini"
                   placeholder="销售政策类型"
                   class="select_height"
                 >
@@ -159,11 +159,11 @@
                   :file-list="importFileList"
                   :show-file-list="false"
                 >
-                  <el-button size="small">导入货品价格表</el-button>
+                  <el-button size="mini">导入货品价格表</el-button>
                 </el-upload>
               </el-col>
               <el-col :span="12" class="tr">
-                <!-- <el-button size="small" @click="$parent.isShow = 10"
+                <!-- <el-button size="mini" @click="$parent.isShow = 10"
                 >查看条件</el-button
               > -->
               </el-col>
@@ -245,7 +245,7 @@
                     v-if="item.type==='REBATE'"
                     style="margin: 5px"
                     type="success"
-                    size="small"
+                    size="mini"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -258,7 +258,7 @@
                    v-if="item.type==='COMMONLY'"
                     style="margin: 5px"
                     type="success"
-                    size="small"
+                    size="mini"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -337,7 +337,7 @@
                 <template v-if="$parent.isShow == 5">
                   <el-button
                     type="text"
-                    size="small"
+                    size="mini"
                     @click="getCommonApi(scope.row)"
                   >编辑</el-button>
                   <el-popconfirm
@@ -358,7 +358,7 @@
                 <el-button
                   v-else
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="
                     ($parent.isShow = 10), ($parent.policyId = scope.row.id) ,
                     $parent.isShow ===8?detailFang = false :detailFang=true
@@ -493,25 +493,25 @@
               <el-col :span="4" class="middle_box" :offset="0">
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 2"
                     @click="handleAllAdd"
                   >全部添加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 2"
                     @click="handleAdd"
                   >增加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 1"
                     @click="handleDelete"
                   >删除</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 1"
                     @click="handleAllDelete"
                   >全部删除</el-button></el-col>
@@ -595,7 +595,7 @@
               <el-col :span="20" class="col value" style="padding-left: 10px">
                 <el-input
                   v-model="remark"
-                  size="small"
+                  size="mini"
                   placeholder="请输入内容"
                 />
               </el-col>
@@ -603,7 +603,7 @@
             <el-row>
               <el-button
                 type="primary"
-                size="small"
+                size="mini"
                 @click="handleSubmit"
               >审核通过</el-button>
             </el-row>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 371 - 364
src/views/sales_policy/components/TabelTransfer.vue


+ 20 - 14
src/views/sales_policy/components/details.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container mymain-container">
     <div v-if="isEdit == 1">
       <el-header height="50px" class="header">
         <el-page-header
@@ -34,7 +34,7 @@
               <div class="value">
                 <el-select
                   v-model="detail.type"
-                  size="small"
+                  size="mini"
                   placeholder="销售政策类型"
                   class="select_height"
                 >
@@ -159,17 +159,18 @@
                   :file-list="importFileList"
                   :show-file-list="false"
                 >
-                  <el-button size="small">导入货品价格表</el-button>
+                  <el-button size="mini">导入货品价格表</el-button>
                 </el-upload>
               </el-col>
               <el-col :span="12" class="tr">
-                <!-- <el-button size="small" @click="$parent.isShow = 10"
+                <!-- <el-button size="mini" @click="$parent.isShow = 10"
                 >查看条件</el-button
               > -->
               </el-col>
             </el-row>
             <el-divider />
           </el-row>
+          <div class="table">
           <el-table
             v-loading="listLoading"
             :data="dataList"
@@ -245,7 +246,7 @@
                     v-if="item.type==='REBATE'"
                     style="margin: 5px"
                     type="success"
-                    size="small"
+                    size="mini"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -258,7 +259,7 @@
                    v-if="item.type==='COMMONLY'"
                     style="margin: 5px"
                     type="success"
-                    size="small"
+                    size="mini"
                   >{{ item.walletName }}</el-tag>
                 </template>
               </template>
@@ -288,6 +289,7 @@
               </template>
             </el-table-column> -->
           </el-table>
+          </div>
           <!-- 分页 -->
           <div style="margin: 20px 0">
             <el-pagination
@@ -312,6 +314,7 @@
             </el-row>
             <el-divider />
           </el-row>
+          <div class="table">
           <el-table
             :data="conditionList"
             element-loading-text="Loading"
@@ -337,7 +340,7 @@
                 <template v-if="$parent.isShow == 5">
                   <el-button
                     type="text"
-                    size="small"
+                    size="mini"
                     @click="getCommonApi(scope.row)"
                   >编辑</el-button>
                   <el-popconfirm
@@ -358,7 +361,7 @@
                 <el-button
                   v-else
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="
                     ($parent.isShow = 12), ($parent.policyId = scope.row.id)
 
@@ -367,6 +370,7 @@
               </template>
             </el-table-column>
           </el-table>
+          </div>
           <el-row>
             <el-divider />
             <el-row type="flex">
@@ -381,6 +385,7 @@
             </el-row>
             <el-divider />
           </el-row>
+          <div class="table">
           <template v-if="$parent.isShow != 5">
             <el-table
               v-loading="listLoading"
@@ -493,25 +498,25 @@
               <el-col :span="4" class="middle_box" :offset="0">
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 2"
                     @click="handleAllAdd"
                   >全部添加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 2"
                     @click="handleAdd"
                   >增加</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 1"
                     @click="handleDelete"
                   >删除</el-button></el-col>
                 <el-col>
                   <el-button
-                    size="small"
+                    size="mini"
                     :disabled="type == 1"
                     @click="handleAllDelete"
                   >全部删除</el-button></el-col>
@@ -573,6 +578,7 @@
               </el-col>
             </el-row>
           </template>
+          </div>
           <div
             v-if="$parent.isShow == 8 && detail.examineStatus == 'WAIT'"
             class="descriptions diy-table-1"
@@ -595,7 +601,7 @@
               <el-col :span="20" class="col value" style="padding-left: 10px">
                 <el-input
                   v-model="remark"
-                  size="small"
+                  size="mini"
                   placeholder="请输入内容"
                 />
               </el-col>
@@ -603,7 +609,7 @@
             <el-row>
               <el-button
                 type="primary"
-                size="small"
+                size="mini"
                 @click="handleSubmit"
               >审核通过</el-button>
             </el-row>

+ 22 - 19
src/views/sales_policy/components/editPolicy.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="app-container" v-show="isCondition == 0">
+    <div class="app-container  mymain-container" v-show="isCondition == 0">
       <el-header height="50px" class="header">
         <el-page-header
           content="编辑"
@@ -15,7 +15,7 @@
             ref="form"
             :model="searchForm"
             label-width="120px"
-            size="small"
+            size="mini"
             class="demo-searchForm"
           >
             <el-row>
@@ -40,7 +40,7 @@
                 <el-form-item label="销售政策类型" prop="type">
                   <el-select
                     v-model="searchForm.type"
-                    size="small"
+                    size="mini"
                     placeholder="销售政策类型"
                     class="select_height"
                   >
@@ -121,20 +121,21 @@
                   >
                     <el-button
                       type="primary"
-                      size="small"
+                      size="mini"
                     >导入货品价格表</el-button>
                   </el-upload>
                 </template>
 
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="hanleDownloadFiles"
                 >下载模板</el-button>
               </el-col>
             </el-row>
             <el-divider />
           </el-row>
+          <div class="table">
           <el-table
             v-loading="listLoading"
             :data="dataList"
@@ -163,7 +164,7 @@
                 <el-select
                   v-model="scope.row.materialNumber"
                   v-el-select-loadmore="loadmore"
-                  size="small"
+                  size="mini"
                   :remote-method="(query)=>remoteMethod(query,'number')"
                   filterable
                   remote
@@ -203,7 +204,7 @@
 
                 <el-select
                   v-model="scope.row.specification"
-                  size="small"
+                  size="mini"
                   :remote-method="(query)=>remoteMethod(query,'specification')"
                   filterable
                   remote
@@ -229,7 +230,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.saleTypeId"
-                  size="small"
+                  size="mini"
                   filterable
                   @change="handleSalesType($event, scope.row)"
                 >
@@ -253,11 +254,12 @@
             <el-table-column prop="discAmount" label="格力折扣" align="right">
               <template slot-scope="scope">
                 <el-input
+                size="mini"
                   class="yinput"
                   v-model.number="scope.row.discAmount"
                   type="number"
                   placeholder="请输入格力折扣"
-                  size="small"
+
                 />
               </template>
             </el-table-column>
@@ -269,7 +271,7 @@
                   v-model.number="scope.row.price"
                   type="number"
                   placeholder="请输入单价"
-                  size="small"
+                  size="mini"
                 />
               </template>
             </el-table-column>
@@ -278,7 +280,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.rebateWalletIds"
-                  size="small"
+                  size="mini"
                   multiple
                   filterable
                 >
@@ -296,7 +298,7 @@
               <template slot-scope="scope">
                 <el-select
                   v-model="scope.row.walletIds"
-                  size="small"
+                  size="mini"
                   multiple
                   filterable
                 >
@@ -310,7 +312,7 @@
                 <!-- <el-tag
                   style="margin: 5px"
                   type="success"
-                  size="small"
+                  size="mini"
                   v-for="item in scope.row.walletRelaList"
                   >{{ item.walletName }}</el-tag
                 > -->
@@ -322,7 +324,7 @@
                 <el-input
                   v-model="scope.row.remark"
                   placeholder="备注"
-                  size="small"
+                  size="mini"
                 />
               </template>
             </el-table-column>
@@ -345,6 +347,7 @@
               </template>
             </el-table-column>
           </el-table>
+          </div>
           <!-- 分页 -->
           <div
             style="
@@ -356,12 +359,12 @@
             <div>
               <el-button
                 type="primary"
-                size="small"
+                size="mini"
                 @click="handleNewInfo"
               >添加</el-button>
               <el-button
                 type="primary"
-                size="small"
+                size="mini"
                 @click="handleSave"
               >保存</el-button>
             </div>
@@ -384,7 +387,7 @@
                 </h4>
                 <el-button
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="addCondition"
                 >添加</el-button></el-col>
             </el-row>
@@ -426,12 +429,12 @@
               <template slot-scope="scope">
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="scope.row.fang = false; conditName=scope.row.name"
                 >编辑</el-button>
                 <el-button
                   type="text"
-                  size="small"
+                  size="mini"
                   @click="handleCondition(scope.row.id, scope.$index)"
                 >删除</el-button>
               </template>

Nem az összes módosított fájl került megjelenítésre, mert túl sok fájl változott