Explorar o código

【修改】bug

howie %!s(int64=3) %!d(string=hai) anos
pai
achega
4019a4fae0

+ 6 - 1
src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -42,7 +42,12 @@
             <div class="label">固定电话</div>
             <div class="value">{{ details.refTel }}</div>
           </el-col>
-
+              <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+              <div class="label">格力备注</div>
+              <div class="value">
+                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
+              </div>
+            </el-col>
           <el-col :xs="24" :sm="24" :lg="8" class="item">
             <div class="label">厂工程编码</div>
             <div class="value">

+ 3 - 1
src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -78,7 +78,9 @@
             </el-col>
                  <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
               <div class="label">格力备注</div>
-              <div class="value">{{ details.geLiInerNote }}</div>
+              <div class="value">
+                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
+              </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>

+ 286 - 212
src/views/deposit_commerce/deposit_list.vue

@@ -5,7 +5,7 @@
         <el-radio-button label="全部" />
         <el-radio-button label="已退押" />
       </el-radio-group>
-      <br><br>
+      <br /><br />
       <!-- 筛选条件 -->
       <div>
         <el-form
@@ -49,17 +49,7 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请日期" prop="startDeliverTime">
-                <el-date-picker
-                  v-model="screenForm.startDeliverTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请日期" prop="startSubmitTime">
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
                   class="dateStyle"
@@ -68,50 +58,54 @@
                 />
               </el-form-item>
             </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始验收日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
-              </el-form-item>
-            </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束验收日期" prop="endConfirmTime">
+              <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
-                  v-model="screenForm.endConfirmTime"
+                  v-model="screenForm.endSubmitTime"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+
+
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
-              <el-option  label="默认" :value="null"></el-option>
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.isRefundDeposit"
+                  placeholder="请选择是否退押 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
 
-                <el-option v-for="item in refundDepositArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+                  <el-option
+                    v-for="item in refundDepositArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
-              <el-option  label="默认" :value="null"></el-option>
+                <el-select
+                  style="width: 100%"
+                  v-model="screenForm.examineStatus"
+                  placeholder="请选择状态 "
+                >
+                  <el-option label="默认" :value="null"></el-option>
 
-                <el-option v-for="item in examineStatusArr"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+                  <el-option
+                    v-for="item in examineStatusArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -124,79 +118,133 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-                   <template v-if="!isCustomer">
-                   <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="机型" prop="specification">
-                <el-input
-                  v-model="screenForm.specification"
-                  placeholder="请输入机型"
-                />
-              </el-form-item>
-            </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input
-                  v-model="screenForm.specialNo"
-                  placeholder="请输入特价编号"
-                />
-              </el-form-item>
-            </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="厂编号" prop="refFactoryNo">
-                <el-input
-                  v-model="screenForm.refFactoryNo"
-                  placeholder="请输入厂编号"
-                />
-              </el-form-item>
-            </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="confirmName">
-                <el-input
-                  v-model="screenForm.confirmName"
-                  placeholder="请输入审核人"
+              <el-form-item label="开始验收日期" prop="startConfirmTime">
+                <el-date-picker
+                  v-model="screenForm.startConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input
-                  v-model="screenForm.refRegionWork"
-                  placeholder="请输入区域"
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束验收日期" prop="endConfirmTime">
+                <el-date-picker
+                  v-model="screenForm.endConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker
+            <template v-if="!isCustomer">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审核人" prop="confirmName">
+                  <el-input
+                    v-model="screenForm.confirmName"
+                    placeholder="请输入审核人"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="区域" prop="refRegionWork">
+                  <el-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
+                </el-form-item>
+              </el-col>
+                 <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="安装日期" >
+                  <div class="fanwei">
+                     <el-form-item prop="startInstallTime">
+                          <el-date-picker
                   v-model="screenForm.startInstallTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder="选择安装日期"
+                  placeholder="选择日期"
                 />
-              </el-form-item>
-            </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
                   v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder="选择安装日期"
+                  placeholder="选择日期"
                 />
-              </el-form-item>
-            </el-col>
-              </template>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="机型" >
+                  <div class="fanwei">
+                     <el-form-item prop="startSpecification">
+                        <el-input  v-model="screenForm.startSpecification" ></el-input>
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endSpecification">
+                    <el-input  v-model="screenForm.endSpecification" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                  <el-form-item label="特价编号" >
+                  <div class="fanwei">
+                     <el-form-item prop="startSpecialNo">
+                        <el-input  v-model="screenForm.startSpecialNo" ></el-input>
+                     </el-form-item>
+                  <span>-</span>
+                    <el-form-item prop="endSpecialNo">
+                    <el-input  v-model="screenForm.endSpecialNo" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+               <el-form-item label="厂编号" >
+                  <div class="fanwei">
+                     <el-form-item prop="startRefFactoryNo">
+                        <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
+                     </el-form-item>
+                  <span>-</span>
+                    <el-form-item prop="endRefFactoryNo">
+                    <el-input  v-model="screenForm.endRefFactoryNo" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+
+              </el-col>
+              <!-- <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="产品编码" >
+                  <div class="fanwei">
+                     <el-form-item prop="startMaterialOldNumber">
+                        <el-input type="startMaterialOldNumber" ></el-input>
+                     </el-form-item>
+
+                  <span>-</span>
+                    <el-form-item prop="endMaterialOldNumber">
+                    <el-input type="endMaterialOldNumber" ></el-input>
+                     </el-form-item>
+                  </div>
+
+                </el-form-item>
+
+
+              </el-col> -->
+
+            </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
-                <el-button
-                  size="mini"
-                  @click="resetScreenForm"
-                >清空</el-button>
-                <el-button
-                  size="mini"
-                  type="primary"
-                  @click="submitScreenForm"
-                >搜索</el-button>
+                <el-button size="mini" @click="resetScreenForm">清空</el-button>
+                <el-button size="mini" type="primary" @click="submitScreenForm"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -204,11 +252,9 @@
       </div>
       <!-- 按钮 -->
       <div class="btn-group clearfix" style="display: flex">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="hanleDownloadFiles"
-        >导出</el-button>
+        <el-button type="primary" size="mini" @click="hanleDownloadFiles"
+          >导出</el-button
+        >
         <el-upload
           v-if="$checkBtnRole('import', $route.meta.roles)"
           class="import-btn"
@@ -251,14 +297,14 @@
               min-width="160"
               show-overflow-tooltip
             />
-             <el-table-column
+            <el-table-column
               align="left"
               label="申请日期"
               prop="submitTime"
               min-width="160"
               show-overflow-tooltip
             />
-             <el-table-column
+            <el-table-column
               align="left"
               label="验收日期"
               prop="checkDate"
@@ -308,7 +354,8 @@
                   v-if="scope.row.isRefundDeposit"
                   type="success"
                   size="small"
-                >是</el-tag>
+                  >是</el-tag
+                >
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
@@ -343,29 +390,32 @@
                   v-if="scope.row.examineStatus == 'SAVE'"
                   type="success"
                   size="small"
-                >保存
+                  >保存
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'WAIT'"
                   type="warning"
                   size="small"
-                >待审核
+                  >待审核
                 </el-tag>
                 <el-tag
                   v-if="scope.row.examineStatus == 'OK'"
                   type="warning"
                   size="mini"
-                >通过</el-tag>
+                  >通过</el-tag
+                >
                 <el-tag
                   v-if="scope.row.examineStatus == 'FAIL'"
                   type="warning"
                   size="small"
-                >不通过</el-tag>
+                  >不通过</el-tag
+                >
                 <el-tag
                   v-if="scope.row.examineStatus == 'CLOSE'"
                   type="warning"
                   size="small"
-                >关闭</el-tag>
+                  >关闭</el-tag
+                >
               </template>
             </el-table-column>
             <el-table-column
@@ -395,16 +445,18 @@
                   class="textColor"
                   size="mini"
                   @click="detailFn(scope.row)"
-                >详情</el-button>
+                  >详情</el-button
+                >
                 <el-button
                   v-if="
                     scope.row.examineStatus == 'SAVE' &&
-                      $checkBtnRole('apply', $route.meta.roles)
+                    $checkBtnRole('apply', $route.meta.roles)
                   "
                   type="text"
                   class="textColor"
                   @click="surrenderFn(scope.row)"
-                >申请退押</el-button>
+                  >申请退押</el-button
+                >
                 <!-- <el-button type="text" class="textColor" slot="reference"
                   >免扣退押</el-button
                 > -->
@@ -433,18 +485,18 @@
 </template>
 
 <script>
-import DepositListDetail from './components/deposit_list-detail'
-import DepositApplyDeduction from './components/deposit-apply-deduction.vue'
-import DepositApplySurrender from './components/deposit-apply-surrender.vue'
-import { downloadFiles, handleImport } from '@/utils/util'
-import { getList } from '@/api/engin_deposit.js'
-import Mixin from '@/mixin'
+import DepositListDetail from "./components/deposit_list-detail";
+import DepositApplyDeduction from "./components/deposit-apply-deduction.vue";
+import DepositApplySurrender from "./components/deposit-apply-surrender.vue";
+import { downloadFiles, handleImport } from "@/utils/util";
+import { getList } from "@/api/engin_deposit.js";
+import Mixin from "@/mixin";
 
 export default {
   components: {
     DepositListDetail,
     DepositApplyDeduction,
-    DepositApplySurrender
+    DepositApplySurrender,
   },
   mixins: [Mixin],
   data() {
@@ -454,158 +506,180 @@ export default {
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
       screenForm: {
-        confirmName: '', // 审核人
-        createName: '', // 创建人
-        customerKeyword: '', // 客户编码/客户名称
-        endDeliverTime: '', // 发货申请日期-结束
-        enginOrderNo: '', // 工程订单编号
-        enginOrderType: 'TRADE', // 工程订单类型
-        examineStatus: '', // 状态
-        refEnginRecordNo: '', // 登录单号
-        refProjectName: '', // 项目名称
-        refUseUnit: '', // 使用单位
-        startDeliverTime: '', // 发货申请日期-开始
-        startSubmitTime:'',
-        startConfirmTime:'',
-        isRefundDeposit:null,
-        examineStatus:null,
-          refUseUnit:'',
-        startInstallTime:'',
-          endConfirmTime:'',
-        endInstallTime:'',
-        specification:'',
-        factoryNo:'',
-        specialNo:'',
-        confirmName:'',
-        refRegionWork:''
+        confirmName: "", // 审核人
+        createName: "", // 创建人
+        customerKeyword: "", // 客户编码/客户名称
+        endDeliverTime: "", // 发货申请日期-结束
+        enginOrderNo: "", // 工程订单编号
+        enginOrderType: "TRADE", // 工程订单类型
+        examineStatus: "", // 状态
+        refEnginRecordNo: "", // 登录单号
+        refProjectName: "", // 项目名称
+        refUseUnit: "", // 使用单位
+        startDeliverTime: "", // 发货申请日期-开始
+        startSubmitTime: "",
+        startConfirmTime: "",
+        isRefundDeposit: null,
+        examineStatus: null,
+        refUseUnit: "",
+        startInstallTime: "",
+        endConfirmTime: "",
+        endInstallTime: "",
+        startSpecification:'',
+        startSpecialNo:'',
+        startRefFactoryNo:'',
+        endSpecification:'',
+        endSpecialNo:'',
+        endRefFactoryNo:'',
+        factoryNo: "",
+        specialNo: "",
+        confirmName: "",
+        refRegionWork: "",
+         endSubmitTime:'',
+        startSubmitTime:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
-      deduction: '全部',
+      deduction: "全部",
       showPage: 1,
       importFileList: [],
       selectData: [],
-      baseURL: '',
-      refundDepositArr:[
+      baseURL: "",
+      refundDepositArr: [
         {
-          label:'是',
-          value:true
+          label: "是",
+          value: true,
         },
         {
-          label:'否',
-          value:false
-        }
+          label: "否",
+          value: false,
+        },
       ],
 
-      examineStatusArr:[
-         {
-          label:'保存',
-          value:'SAVE'
+      examineStatusArr: [
+        {
+          label: "保存",
+          value: "SAVE",
         },
         {
-          label:'待审核',
-          value:'WAIT'
+          label: "待审核",
+          value: "WAIT",
         },
         {
-          label:'通过',
-          value:'OK'
+          label: "通过",
+          value: "OK",
         },
         {
-          label:'不通过',
-          value:'FAIL'
+          label: "不通过",
+          value: "FAIL",
         },
         {
-          label:'关闭',
-          value:'CLOSE'
+          label: "关闭",
+          value: "CLOSE",
         },
-      ]
-    }
+      ],
+    };
   },
- computed:{
-    isCustomer(){
-      return this.$store.getters.customerId && this.$store.getters.customerNumber
-    }
+  computed: {
+    isCustomer() {
+      return (
+        this.$store.getters.customerId && this.$store.getters.customerNumber
+      );
+    },
   },
   methods: {
     // 免扣申请
     deductionFn() {
-      this.showPage = 3
+      this.showPage = 3;
     },
     // 申请退押
     surrenderFn(row) {
-      this.depositManageId = row.depositManageId
-      this.showPage = 4
+      this.depositManageId = row.depositManageId;
+      this.showPage = 4;
     },
     detailFn(row) {
-      this.depositManageId = row.depositManageId
-      this.refEnginRecordNo = row.refEnginRecordNo
-      this.showPage = 2
+      this.depositManageId = row.depositManageId;
+      this.refEnginRecordNo = row.refEnginRecordNo;
+      this.showPage = 2;
     },
     getList() {
-      this.listLoading = true
+      this.listLoading = true;
       const params = {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
-        isRefundDeposit: this.deduction === '已退押' ? true : null,
-        ...this.screenForm
-      }
+        isRefundDeposit: this.deduction === "已退押" ? true : null,
+        ...this.screenForm,
+      };
 
       getList(params).then((res) => {
-        this.dataList = res.data.records
+        this.dataList = res.data.records;
         res.data.records.forEach((item) => {
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ['qty']
-          item.sums2 = ['depositAmount', 'diffAmount', 'price']
-        })
-        this.listLoading = false
-        this.listTotal = res.data.total
-      })
+          item.sums1 = ["qty"];
+          item.sums2 = ["depositAmount", "diffAmount", "price"];
+        });
+        this.listLoading = false;
+        this.listTotal = res.data.total;
+      });
     },
     handleRadio() {
-      this.currentPage = 1
-      this.getList()
+      this.currentPage = 1;
+      this.getList();
     },
     hanleDownloadFiles() {
       if (this.selectData.length) {
-        const arr = []
+        const arr = [];
         for (let i = 0; i < this.selectData.length; i++) {
-          arr.push(this.selectData[i].depositManageId)
+          arr.push(this.selectData[i].depositManageId);
         }
-        downloadFiles('/deposit-manage/export', { id: arr,orderType:'TRADE' })
+        downloadFiles("/deposit-manage/export", {
+          id: arr,
+          orderType: "TRADE",
+        });
       } else {
-        this.$errorMsg('请选择押金项')
+        this.$errorMsg("请选择押金项");
       }
     },
     // 导入
     async handleImport(param) {
-      this.importLoading = true
-      const file = param.file
-      console.log(file, 123)
-      const formData = new FormData()
-      formData.append('file', file)
+      this.importLoading = true;
+      const file = param.file;
+      console.log(file, 123);
+      const formData = new FormData();
+      formData.append("file", file);
       // formData.append("policyId", this.screenForm.code);
-      const result = await handleImport('deposit-manage/import', formData)
-      this.importLoading = false
-      this.importFileList = []
+      const result = await handleImport("deposit-manage/import", formData);
+      this.importLoading = false;
+      this.importFileList = [];
       if (result.code == 200) {
-        this.$alert(result.message, '导入成功', {
-          confirmButtonText: '确定'
-        })
+        this.$alert(result.message, "导入成功", {
+          confirmButtonText: "确定",
+        });
 
-        this.handletwoList()
+        this.handletwoList();
       } else {
-        this.$alert(result.message, '导入失败', {
-          confirmButtonText: '确定'
-        })
+        this.$alert(result.message, "导入失败", {
+          confirmButtonText: "确定",
+        });
       }
     },
     handleSelectionAllChange(e) {
-      this.selectData = e
-    }
-  }
-}
+      this.selectData = e;
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
+.fanwei {
+  display: flex;
+
+  span {
+    margin: 0 20px;
+  }
+  div{
+    width:100%
+  }
+}
 .dateStyle {
   width: 100%;
 }

+ 6 - 0
src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -68,6 +68,12 @@
             <div class="label">工程差价总额</div>
             <div class="value">{{ details.depositDiffAmount }}</div>
           </el-col>
+              <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+              <div class="label">格力备注</div>
+              <div class="value">
+                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
+              </div>
+            </el-col>
           <el-col :xs="24" :sm="24" :lg="16" class="item">
             <div class="label">使用单位</div>
             <div class="value">{{ details.refUseUnit }}</div>

+ 4 - 2
src/views/deposit_home/components/deposit_list-detail.vue

@@ -76,9 +76,11 @@
               <div class="label">工程差价总额</div>
               <div class="value">{{ details.depositDiffAmount }}</div>
             </el-col>
-                 <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+                   <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
               <div class="label">格力备注</div>
-              <div class="value">{{ details.geLiInerNote }}</div>
+              <div class="value">
+                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
+              </div>
             </el-col>
              <el-col :xs="24" :sm="24" :lg="12" class="item">
               <div class="label">使用单位</div>

+ 98 - 59
src/views/deposit_home/deposit_list.vue

@@ -49,19 +49,19 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="发货申请日期" prop="startDeliverTime">
+              <el-form-item label="开始申请日期" prop="startSubmitTime">
                 <el-date-picker
-                  v-model="screenForm.startDeliverTime"
+                  v-model="screenForm.startSubmitTime"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
                 />
               </el-form-item>
             </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="申请日期" prop="startSubmitTime">
+         <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
-                  v-model="screenForm.startSubmitTime"
+                  v-model="screenForm.endSubmitTime"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -125,66 +125,88 @@
               </el-form-item>
             </el-col> -->
               <template v-if="!isCustomer">
-                   <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="机型" prop="specification">
-                <el-input
-                  v-model="screenForm.specification"
-                  placeholder="请输入机型"
-                />
-              </el-form-item>
-            </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="特价编号" prop="specialNo">
-                <el-input
-                  v-model="screenForm.specialNo"
-                  placeholder="请输入特价编号"
-                />
-              </el-form-item>
-            </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="厂编号" prop="factoryNo">
-                <el-input
-                  v-model="screenForm.factoryNo"
-                  placeholder="请输入厂编号"
-                />
-              </el-form-item>
-            </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="审核人" prop="confirmName">
-                <el-input
-                  v-model="screenForm.confirmName"
-                  placeholder="请输入审核人"
-                />
-              </el-form-item>
-            </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="区域" prop="refRegionWork">
-                <el-input
-                  v-model="screenForm.refRegionWork"
-                  placeholder="请输入区域"
-                />
-              </el-form-item>
-            </el-col>
-               <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="开始安装日期" prop="startInstallTime">
-                <el-date-picker
+                <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审核人" prop="confirmName">
+                  <el-input
+                    v-model="screenForm.confirmName"
+                    placeholder="请输入审核人"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="区域" prop="refRegionWork">
+                  <el-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
+                </el-form-item>
+              </el-col>
+
+                   <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="安装日期" >
+                  <div class="fanwei">
+                     <el-form-item prop="startInstallTime">
+                          <el-date-picker
                   v-model="screenForm.startInstallTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder="选择安装日期"
+                  placeholder="选择日期"
                 />
-              </el-form-item>
-            </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="结束安装日期" prop="endInstallTime">
-                <el-date-picker
+
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endInstallTime">
+                                 <el-date-picker
                   v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
-                  placeholder="选择安装日期"
+                  placeholder="选择日期"
                 />
-              </el-form-item>
-            </el-col>
+
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                <el-form-item label="机型" >
+                  <div class="fanwei">
+                     <el-form-item prop="startSpecification">
+                        <el-input  v-model="screenForm.startSpecification" ></el-input>
+                     </el-form-item>
+                      <span>-</span>
+                    <el-form-item prop="endSpecification">
+                    <el-input  v-model="screenForm.endSpecification" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+                  <el-form-item label="特价编号" >
+                  <div class="fanwei">
+                     <el-form-item prop="startSpecialNo">
+                        <el-input  v-model="screenForm.startSpecialNo" ></el-input>
+                     </el-form-item>
+                  <span>-</span>
+                    <el-form-item prop="endSpecialNo">
+                    <el-input  v-model="screenForm.endSpecialNo" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="12">
+               <el-form-item label="厂编号" >
+                  <div class="fanwei">
+                     <el-form-item prop="startRefFactoryNo">
+                        <el-input  v-model="screenForm.startRefFactoryNo" ></el-input>
+                     </el-form-item>
+                  <span>-</span>
+                    <el-form-item prop="endRefFactoryNo">
+                    <el-input  v-model="screenForm.endRefFactoryNo" ></el-input>
+                     </el-form-item>
+                  </div>
+                </el-form-item>
+
+              </el-col>
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item label="" class="fr">
@@ -473,11 +495,18 @@ export default {
         endConfirmTime:'',
         startInstallTime:'',
         endInstallTime:'',
-        specification:'',
+        startSpecification:'',
+        startSpecialNo:'',
+        startRefFactoryNo:'',
+        endSpecification:'',
+        endSpecialNo:'',
+        endRefFactoryNo:'',
         factoryNo:'',
         specialNo:'',
         confirmName:'',
-        refRegionWork:''
+        refRegionWork:'',
+        endSubmitTime:'',
+        startSubmitTime:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -605,6 +634,16 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.fanwei {
+  display: flex;
+
+  span {
+    margin: 0 20px;
+  }
+  div{
+    width:100%
+  }
+}
 .dateStyle {
   width: 100%;
 }

+ 35 - 19
src/views/sales_policy/components/AddCondition.vue

@@ -43,7 +43,6 @@
               </el-row>
               <el-row class="table">
                 <el-table
-
                   v-loading="listLoadingArr[`listLoading${index}`]"
                   style="width: 100%"
                   :data="item"
@@ -224,7 +223,13 @@
         </el-col>
       </el-row>
     </el-footer>
-    <el-dialog :visible.sync="VisibleModle" width="80%" center>
+    <el-dialog
+      :visible.sync="VisibleModle"
+      width="80%"
+      center
+      @close="handleClose"
+      :close-on-click-modal="false"
+    >
       <div>
         <el-container>
           <el-header height="">
@@ -258,7 +263,7 @@
                     <el-row class="table">
                       <el-row class="title"> 可选产品列表 </el-row>
                       <el-table
-                         ref="multipleTable"
+                        ref="multipleTable"
                         style="width: 100%"
                         :data="conditList"
                         border
@@ -324,12 +329,11 @@
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             :current-page="currentPage"
+                            :page-size.sync="mySize"
                             :page-sizes="[10, 20, 30, 50]"
-                            :page-size="10"
                             layout="total, sizes, prev, pager, next, jumper"
                             :total="listTotal"
-                          >
-                          </el-pagination>
+                          />
                         </div>
                       </el-row>
                     </el-row>
@@ -451,7 +455,7 @@
         </el-container>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="VisibleModle = false">取 消</el-button>
+        <el-button @click="VisibleModle = false;handleClose()">取 消</el-button>
         <el-button type="primary" @click="handleDiaSubmit">确 定</el-button>
       </span>
     </el-dialog>
@@ -521,12 +525,14 @@ export default {
       type: "",
       saleTypeCode: "",
       arrIndex: 0,
+      pageSize: 10,
       popArr: {},
       fang: false,
       newConditionBox: [],
       currentPage: 1,
       edit: "",
-      listLoadingArr:{}
+      mySize: 10,
+      listLoadingArr: {},
     };
   },
   created() {
@@ -539,10 +545,9 @@ export default {
     getList() {},
     handleBack() {
       if (this.$parent.isShow == 10) {
-             this.$parent.isShow = 8
-
-      }else if(this.$parent.isShow == 12){
-              this.$parent.isShow = 4
+        this.$parent.isShow = 8;
+      } else if (this.$parent.isShow == 12) {
+        this.$parent.isShow = 4;
       } else {
         this.$parent.isCondition = 0;
         Object.assign(this.$data, this.$options.data());
@@ -580,11 +585,11 @@ export default {
             continue;
           }
           this.$set(this.popArr, `line_${i - 1}`, pop[i]);
-          this.$set(this.listLoadingArr,`listLoading${i}`,false)
+          this.$set(this.listLoadingArr, `listLoading${i}`, false);
         }
 
         for (let k = 0; k < pop.length; k++) {
-          this.listLoadingArr[`listLoading${k}`]=true
+          this.listLoadingArr[`listLoading${k}`] = true;
           const { data } = await getConditionMaterialList({
             pageNum: 1,
             pageSize: -1,
@@ -596,7 +601,7 @@ export default {
           } else {
             this.conditionBoxs.push(data.records);
           }
-          this.listLoadingArr[`listLoading${k}`]=false
+          this.listLoadingArr[`listLoading${k}`] = false;
         }
       }
     },
@@ -638,7 +643,7 @@ export default {
       const params = {
         id: "",
         policyConditionMaterials: tableData,
-        policyId:    this.$parent.searchForm.code || this.comCode,
+        policyId: this.$parent.searchForm.code || this.comCode,
         policyName: "",
         pop: pop.join(":"),
       };
@@ -653,7 +658,10 @@ export default {
         this.$parent.isCondition = 0;
         this.$parent.isFlag = 1;
         // Object.assign(this.$data, this.$options.data());
-        this.$emit("handleSubmitCon", this.$parent.searchForm.code || this.comCode );
+        this.$emit(
+          "handleSubmitCon",
+          this.$parent.searchForm.code || this.comCode
+        );
       });
     },
     handleSelectionChange(val) {
@@ -703,9 +711,10 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         saleTypeCode: this.saleTypeCode,
-        policyId:  this.$parent.searchForm.code || this.comCode ,
+        policyId: this.$parent.searchForm.code || this.comCode,
       }).then((res) => {
         let datas = [];
+
         for (let j = 0; j < this.conditionBox.length; j++) {
           datas = [...datas, ...this.conditionBox[j]];
         }
@@ -751,7 +760,6 @@ export default {
           }
           this.conditList = res.data.records;
         } else {
-          console.log(datas, "4455454", res.data.records);
           const newData = datas;
           if (newData.length) {
             for (let i = 0; i < res.data.records.length; i++) {
@@ -813,12 +821,20 @@ export default {
             ]);
           }
         }
+        this.mySize = 10;
+        this.currentPage = 1;
+        this.pageSize = 10;
         this.VisibleModle = false;
         this.conditList2 = [];
       } else {
         this.$errorMsg("请选择内容");
       }
     },
+    handleClose() {
+      this.mySize = 10;
+      this.currentPage = 1;
+      this.pageSize = 10;
+    },
     handleresale() {
       Object.assign(this.$data, this.$options.data());
     },

+ 11 - 27
src/views/sales_policy/components/details.vue

@@ -32,8 +32,9 @@
             <el-col :span="24" class="item">
               <div class="label">销售政策类型</div>
               <div class="value">
-                {{detail.type}}
-                <!-- <el-select
+                {{detail.type =='PROVISION'?'配提':'限量'}}
+                <!-- <el-select value: 'PROVISION',
+          label: '配提'
                   v-model="detail.type"
                   size="mini"
                   placeholder="销售政策类型"
@@ -53,10 +54,8 @@
             <el-col :span="24" class="item">
               <div class="label">备注</div>
               <div class="value">
-                <el-input
-                  v-model="detail.remark"
-                  placeholder="请输入备注"
-                />
+                {{detail.remark}}
+
               </div>
             </el-col>
 
@@ -67,37 +66,22 @@
             <el-col :span="8" class="item">
               <div class="label">制单日期</div>
               <div class="value">
-                <el-date-picker
-                  v-model="detail.createTime"
-                  type="datetime"
-                  placeholder="制单日期"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
+                {{detail.createTime}}
+
               </div>
             </el-col>
             <el-col :span="8" class="item">
               <div class="label">生效日期</div>
               <div class="value">
-                <el-date-picker
-                  v-model="detail.startTime"
-                  type="datetime"
-                  placeholder="生效日期"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
+                {{detail.startTime}}
+
               </div>
             </el-col>
             <el-col :span="24" class="item">
               <div class="label">失败日期</div>
               <div class="value">
-                <el-date-picker
-                  v-model="detail.endTime"
-                  type="datetime"
-                  placeholder="生效日期"
-                  default-time="00:00:00"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                />
+                {{detail.endTime}}
+
               </div>
             </el-col>
           </el-row>

+ 15 - 3
src/views/sales_policy/policy_list.vue

@@ -146,7 +146,17 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :ms="6" :lg="6" class="tr">
+
+            <el-col :xs="24" :ms="6" :lg="6">
+              <el-form-item label="" prop="specification">
+                <el-input
+                  v-model="screenForm.specification"
+                  placeholder="机型"
+                  size="mini"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :ms="24" :lg="24" class="tr">
               <el-form-item>
                 <el-button
                   type="primary"
@@ -405,7 +415,8 @@ export default {
         status: '',
         title: '',
         type: '',
-        customerId:''
+        customerId:'',
+        specification:''
       },
       fileList: [],
       statusOptions: [
@@ -492,7 +503,8 @@ export default {
         startTime2: this.screenForm.startTime2,
         status: this.screenForm.status,
         title: this.screenForm.title,
-        customerId:this.screenForm.customerId
+        customerId:this.screenForm.customerId,
+        specification:this.screenForm.specification
       }
       getList(params).then((res) => {
         this.dataList = res.data.records

+ 1 - 1
src/views/supply/policy/components/retail_detail.vue

@@ -274,7 +274,7 @@
              <el-table-column
               align="left"
               label="表体业务员"
-              prop="seviceName"
+              prop="serviceName"
               min-width="100"
               show-overflow-tooltip
             />

+ 1 - 1
src/views/supply/policy/components/retail_examine.vue

@@ -246,7 +246,7 @@
              <el-table-column
               align="left"
               label="表体业务员"
-              prop="seviceName"
+              prop="serviceName"
               min-width="100"
               show-overflow-tooltip
             />

+ 1 - 1
src/views/supply/policy/policy_list.vue

@@ -399,7 +399,7 @@
              <el-table-column
               align="left"
               label="表体业务员"
-              prop="seviceName"
+              prop="serviceName"
               min-width="100"
               show-overflow-tooltip
             />