【修改】bug

src/views/deposit_commerce/components/deposit-apply-surrender.vue

@@ -440,7 +440,7 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['hasSendQty', 'dataQty', 'qty']
+        item.sums1 = ['hasSendQty', 'dataQty', 'qty',"hasSendQty"]
         item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
       })
       res.data.items = arr

src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -908,7 +908,7 @@ export default {
               arr.push(item)
             }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
             item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
           })
           res.data.items = arr

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -759,7 +759,7 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty","hasSendQty"];
         item.sums2 = ["totalAmount", "diffAmount", "price",'depositAmount'];
       });
       res.data.items = arr

src/views/deposit_commerce/deposit_list.vue

@@ -669,7 +669,7 @@ export default {
         res.data.records.forEach((item) => {
           item.totalPrice = item.itemPrice * item.itemQty
           // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-          item.sums1 = ['qty','hasSendQty','itemDataQty']
+          item.sums1 = ['qty','hasSendQty','itemDataQty',"hasSendQty"]
           item.sums2 = ['itemDepositAmount', 'diffAmount', 'price','totalAmount','depositAmount','totalPrice']
         })
         this.listLoading = false

src/views/deposit_commerce/refund_list.vue

@@ -676,7 +676,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
-        item.sums1 = ["hasSendQty", "itemDataQty", "itemQty"];
+        item.sums1 = ["hasSendQty", "itemDataQty", "itemQty","hasSendQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",

src/views/deposit_home/components/deposit-apply-surrender.vue

@@ -458,7 +458,7 @@ export default {
               arr.push(item)
             }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
+        item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
         item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
       })
       res.data.items = arr

src/views/deposit_home/components/deposit_list-detail.vue

@@ -930,7 +930,7 @@ export default {
               arr.push(item)
             }
             // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty']
+            item.sums1 = ['orderHasSendQty', 'dataQty', 'qty',"hasSendQty"]
             item.sums2 = ['totalAmount', 'diffAmount', 'price','depositAmount']
           })
           res.data.items = arr

src/views/deposit_home/components/refund_list-detail.vue

@@ -207,8 +207,8 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料提交日期</div>
-          <!-- <div class="value">{{ detailList.remark }}</div> -->
-          <div class="value">
+          <div class="value">{{ detailList.refDatumProvideDate }}</div>
+          <!-- <div class="value">
             <el-date-picker
               prefix-icon="''"
               placeholder="请选择安装时间"
@@ -219,12 +219,12 @@
               value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
-          </div>
+          </div> -->
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">大额工程</div>
-          <!-- <div class="value">{{ detailList.remark }}</div> -->
-          <div class="value">
+          <div class="value">{{ detailList.refIsBigAmounts }}</div>
+          <!-- <div class="value">
             <el-select
               v-model="detailList.refIsBigAmounts"
               v
@@ -234,7 +234,7 @@
               <el-option label="是" value="是"> </el-option>
               <el-option label="否" value="否"> </el-option>
             </el-select>
-          </div>
+          </div> -->
         </el-col>
         <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">合同变更批复结果</div>
@@ -353,10 +353,11 @@
               v-model="detailList.refOtherAnnexIdea"
             ></el-input>
           </div>
-        </el-col>  <el-col :xs="24" :sm="24" :lg="8" class="item">
+        </el-col>
+        <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">资料审核日期</div>
-          <!-- <div class="value">{{ detailList.remark }}</div> -->
-          <div class="value">
+          <div class="value">{{ detailList.refDatumAcceptDate }}</div>
+          <!-- <div class="value">
             <el-date-picker
             readonly
               prefix-icon="''"
@@ -368,7 +369,7 @@
               value-format="yyyy-MM-dd HH:mm:ss"
             >
             </el-date-picker>
-          </div>
+          </div> -->
         </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
@@ -1138,7 +1139,7 @@ export default {
           arr.push(item);
         }
         // item.number = (item.qty*100 - item.directTransferQty*100 - item.retiredQty*100) / 100;
-        item.sums1 = ["orderHasSendQty", "dataQty", "qty"];
+        item.sums1 = ["orderHasSendQty", "dataQty", "qty", "hasSendQty"];
         item.sums2 = [
           "totalAmount",
           "diffAmount",

src/views/deposit_home/refund_list.vue

@@ -11,16 +11,28 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
+        <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="140px"
+          size="mini"
+          label-position="left"
+        >
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.refEnginRecordNo"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.customerKeyword"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -33,41 +45,77 @@
             </el-col> -->
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="行业类别" prop="refTradeCategory">
-                <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
+                <el-input
+                  v-model="screenForm.refTradeCategory"
+                  placeholder="请输入"
+                ></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
+                <el-input
+                  v-model="screenForm.refUseUnit"
+                  placeholder="请输入"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker v-model="screenForm.startSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
+                <el-date-picker
+                  v-model="screenForm.startSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker v-model="screenForm.endSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
+                <el-date-picker
+                  v-model="screenForm.endSubmitTime"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                />
               </el-form-item>
             </el-col>
 
             <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-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
+                    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-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
+                    v-for="item in examineStatusArr"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -84,82 +132,139 @@
             </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" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                <el-date-picker
+                  v-model="screenForm.startConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <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" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                <el-date-picker
+                  v-model="screenForm.endConfirmTime"
+                  class="dateStyle"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="选择日期"
+                />
               </el-form-item>
             </el-col>
             <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-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-input
+                    v-model="screenForm.refRegionWork"
+                    placeholder="请输入区域"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期" style="margin-bottom:0">
+                <el-form-item label="安装日期" style="margin-bottom: 0">
                   <div class="fanwei">
                     <el-form-item prop="startInstallTime">
-                      <el-date-picker v-model="screenForm.startInstallTime" value-format="yyyy-MM-dd HH:mm:ss" class="dateStyle" type="datetime" placeholder="选择日期" />
+                      <el-date-picker
+                        v-model="screenForm.startInstallTime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
                     </el-form-item>
                     <span>-</span>
                     <el-form-item prop="endInstallTime">
-                      <el-date-picker v-model="screenForm.endInstallTime" value-format="yyyy-MM-dd HH:mm:ss" class="dateStyle" type="datetime" placeholder="选择日期" />
+                      <el-date-picker
+                        v-model="screenForm.endInstallTime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        class="dateStyle"
+                        type="datetime"
+                        placeholder="选择日期"
+                      />
                     </el-form-item>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                  <el-input v-model="screenForm.specification" placeholder="规格型号"></el-input>
+                  <el-input
+                    v-model="screenForm.specification"
+                    placeholder="规格型号"
+                  ></el-input>
                 </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-input>
+                  <el-input
+                    v-model="screenForm.specialNo"
+                    placeholder="特价编号"
+                  ></el-input>
                 </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-input>
+                  <el-input
+                    v-model="screenForm.refFactoryNo"
+                    placeholder="跨区厂编号"
+                  ></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="格力内部备注" prop="geLiInerNote">
-                  <el-input v-model="screenForm.geLiInerNote" placeholder="格力内部备注"></el-input>
+                  <el-input
+                    v-model="screenForm.geLiInerNote"
+                    placeholder="格力内部备注"
+                  ></el-input>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" >
-                <el-form-item label="厂编号" style="margin-bottom:0">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" style="margin-bottom: 0">
                   <div class="fanwei">
-                     <el-form-item prop="startFactoryNo">
-                      <el-input  v-model="screenForm.startFactoryNo" placeholder="厂编号开始" ></el-input>
-
-                     </el-form-item>
-                      <span>-</span>
+                    <el-form-item prop="startFactoryNo">
+                      <el-input
+                        v-model="screenForm.startFactoryNo"
+                        placeholder="厂编号开始"
+                      ></el-input>
+                    </el-form-item>
+                    <span>-</span>
                     <el-form-item prop="endFactoryNo">
-
-                      <el-input  v-model="screenForm.endFactoryNo" placeholder="厂编号结束" ></el-input>
-
-                     </el-form-item>
+                      <el-input
+                        v-model="screenForm.endFactoryNo"
+                        placeholder="厂编号结束"
+                      ></el-input>
+                    </el-form-item>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核开始日期" prop="startAcceptTime">
-                  <el-date-picker v-model="screenForm.startAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                  <el-date-picker
+                    v-model="screenForm.startAcceptTime"
+                    class="dateStyle"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="资料审核结束日期" prop="endAcceptTime">
-                  <el-date-picker v-model="screenForm.endAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                  <el-date-picker
+                    v-model="screenForm.endAcceptTime"
+                    class="dateStyle"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    placeholder="选择日期"
+                  />
                 </el-form-item>
               </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -179,7 +284,6 @@
 
 
               </el-col> -->
-
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
               <div class="fl">
@@ -191,7 +295,9 @@
               </div>
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="resetFn">清空</el-button>
-                <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
+                <el-button size="mini" type="primary" @click="searchFn"
+                  >搜索</el-button
+                >
               </el-form-item>
             </el-col>
           </el-row>
@@ -205,18 +311,31 @@
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
           <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-                      <el-popconfirm
-              title="批量审核吗？"
-              @onConfirm="batchExamine"  v-if="$checkBtnRole('examine', $route.meta.roles)"
+          <el-popconfirm
+            title="批量审核吗？"
+            @onConfirm="batchExamine"
+            v-if="$checkBtnRole('examine', $route.meta.roles)"
+          >
+            <el-button
+              slot="reference"
+              size="mini"
+              type="warning"
+              icon="el-icon-finished"
+              >批量审核工程机已审单据</el-button
             >
-              <el-button slot="reference" size="mini" type="warning" icon="el-icon-finished" >批量审核工程机已审单据</el-button>
-
-            </el-popconfirm>
-
+          </el-popconfirm>
         </div>
         <div class="fr">
-          <el-button type="primary" size="mini" @click="exportFn">导出</el-button>
-          <el-upload class="import-btn" action="" :http-request="handleImport" :file-list="importFileList" :show-file-list="false">
+          <el-button type="primary" size="mini" @click="exportFn"
+            >导出</el-button
+          >
+          <el-upload
+            class="import-btn"
+            action=""
+            :http-request="handleImport"
+            :file-list="importFileList"
+            :show-file-list="false"
+          >
             <el-button type="primary" size="mini">导入</el-button>
           </el-upload>
         </div>
@@ -224,111 +343,259 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange" show-summary :summary-method="$getSummaries">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            @selection-change="handleSelectionChange"
+            show-summary
+            :summary-method="$getSummaries"
+          >
             >
             <el-table-column type="selection" align="center" width="55">
             </el-table-column>
-            <el-table-column align="left" label="状态" prop="" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="状态"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template v-slot="{ row }">
-                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'">保存</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'WAIT'" type="warning">待审核</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'OK'" type="success">通过</el-tag>
-                <el-tag size="mini" v-show="row.examineStatus == 'FAIL'" type="danger">不通过</el-tag>
+                <el-tag size="mini" v-show="row.examineStatus == 'SAVE'"
+                  >保存</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'WAIT'"
+                  type="warning"
+                  >待审核</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'OK'"
+                  type="success"
+                  >通过</el-tag
+                >
+                <el-tag
+                  size="mini"
+                  v-show="row.examineStatus == 'FAIL'"
+                  type="danger"
+                  >不通过</el-tag
+                >
               </template>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="工程登录编号"
+              prop="refEnginRecordNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
-                <span>{{scope.row.refEnginRecordNo}}</span>
+                <span>{{ scope.row.refEnginRecordNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="申请日期"
+              prop="submitTime"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <span>{{scope.row.submitTime}}</span>
+                <span>{{ scope.row.submitTime }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="受理日期" prop="checkDate" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="受理日期"
+              prop="checkDate"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <span>{{scope.row.checkDate}}</span>
+                <span>{{ scope.row.checkDate }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商编码"
+              prop="customerNumber"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
-                <span>{{scope.row.customerNumber}}</span>
+                <span>{{ scope.row.customerNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="经销商名称"
+              prop="customerName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
-                <span>{{scope.row.customerName}}</span>
+                <span>{{ scope.row.customerName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="跨厂区编号" prop="refFactoryNo" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="跨厂区编号"
+              prop="refFactoryNo"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refFactoryNo" />
-                <span>{{scope.row.refFactoryNo}}</span>
+                <span>{{ scope.row.refFactoryNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="厂编号"
+              prop="factoryNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="特价编号"
+              prop="specialNo"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="left" label="行业类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="行业类别"
+              prop="refTradeCategory"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refTradeCategory" />
-                <span>{{scope.row.refTradeCategory}}</span>
+                <span>{{ scope.row.refTradeCategory }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="使用单位"
+              prop="refUseUnit"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refUseUnit" />
-                <span>{{scope.row.refUseUnit}}</span>
+                <span>{{ scope.row.refUseUnit }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="区域"
+              prop="refRegionWork"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
-                <span>{{scope.row.refRegionWork}}</span>
+                <span>{{ scope.row.refRegionWork }}</span>
               </template>
             </el-table-column>
-            <el-table-column v-if="!isCustomer" align="left" label="格力内部备注" prop="geLiInerNote" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              v-if="!isCustomer"
+              align="left"
+              label="格力内部备注"
+              prop="geLiInerNote"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <span>{{scope.row.geLiInerNote}}</span>
+                <span>{{ scope.row.geLiInerNote }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="物料编码"
+              prop="materialNumber"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
-                <span>{{scope.row.materialNumber}}</span>
+                <span>{{ scope.row.materialNumber }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品编码"
+              prop="materialOldNumber"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
-                <span>{{scope.row.materialOldNumber}}</span>
+                <span>{{ scope.row.materialOldNumber }}</span>
               </template>
             </el-table-column>
 
-            <el-table-column align="left" label="产品名称" prop="materialName" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="产品名称"
+              prop="materialName"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialName" />
-                <span>{{scope.row.materialName}}</span>
+                <span>{{ scope.row.materialName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="260" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="规格型号"
+              prop="specification"
+              min-width="260"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
-                <span>{{scope.row.specification}}</span>
+                <span>{{ scope.row.specification }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="是否退押" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="是否退押"
+              prop="isRefundDeposit"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.isRefundDeposit" type="success" size="small">是</el-tag>
+                <el-tag
+                  v-if="scope.row.isRefundDeposit"
+                  type="success"
+                  size="small"
+                  >是</el-tag
+                >
                 <el-tag v-else type="warning" size="small">否</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="押金金额" prop="itemDepositAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="押金金额"
+              prop="itemDepositAmount"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 {{ scope.row.itemDepositAmount | numToFixed }}
               </template>
@@ -336,59 +603,119 @@
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column> -->
 
-            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="安装日期"
+              prop="installDate"
+              min-width="160"
+              show-overflow-tooltip
+            >
             </el-table-column>
-            <el-table-column align="left" label="审核人" prop="confirmName" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="left"
+              label="审核人"
+              prop="confirmName"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.confirmName" />
-                <span>{{scope.row.confirmName}}</span>
+                <span>{{ scope.row.confirmName }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="right" label="金额" prop="totalPrice" min-width="160" show-overflow-tooltip>
+            <el-table-column
+              align="right"
+              label="金额"
+              prop="totalPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
               <template slot-scope="scope">
-                {{ scope.row.totalPrice | numToFixed}}
+                {{ scope.row.totalPrice | numToFixed }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="right"
+              label="订单数量"
+              prop="itemQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              align="right"
+              label="合同价格"
+              prop="contractPrice"
+              min-width="160"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{ scope.row.contractPrice | numToFixed }}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="订单数量" prop="itemQty" min-width="160" show-overflow-tooltip />
-            <el-table-column align="right" label="合同价格" prop="contractPrice" min-width="160" show-overflow-tooltip >
-                <template slot-scope="scope">
-                  {{ scope.row.contractPrice | numToFixed}}
-                </template>
-              </el-table-column>
 
-            <el-table-column align="right" label="发货数量" prop="orderHasSendQty" min-width="160" show-overflow-tooltip />
+            <el-table-column
+              align="right"
+              label="发货数量"
+              prop="orderHasSendQty"
+              min-width="160"
+              show-overflow-tooltip
+            />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.depositAmount | numToFixed}}
               </template>
             </el-table-column> -->
+
             <el-table-column align="right" label="上交资料" prop="itemDataQty" min-width="160" show-overflow-tooltip />
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
+
               <template slot-scope="scope">
-                <el-button type="text" class="textColor" v-if="
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-if="
                     scope.row.examineStatus == 'WAIT' &&
                     $checkBtnRole('examine', $route.meta.roles)
-                  " @click="examineFn(scope.row.depositManageId)">审批</el-button>
+                  "
+                  @click="examineFn(scope.row.depositManageId)"
+                  >审批</el-button
+                >
 
-                <el-button type="text" class="textColor" v-if="
+                <el-button
+                  type="text"
+                  class="textColor"
+                  v-if="
                     scope.row.examineStatus == 'SAVE' ||
                     scope.row.examineStatus == 'OK' ||
                     scope.row.examineStatus == 'FAIL'
-                  " @click="infoFn(scope.row.depositManageId)">详情</el-button>
+                  "
+                  @click="infoFn(scope.row.depositManageId)"
+                  >详情</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
         </div>
         <!-- 分页 -->
         <div class="fr">
-          <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage" :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper" :total="listTotal">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="pageSize"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal"
+          >
           </el-pagination>
         </div>
       </div>
     </div>
     <RefundListDetail @updateList="updateList" :detailId="detailId" v-else />
-    <ExamineDialog :isShow.sync="isShowExamineDialog" :examineForm.sync="examineForm" />
-
+    <ExamineDialog
+      :isShow.sync="isShowExamineDialog"
+      :examineForm.sync="examineForm"
+    />
   </div>
 </template>
 
@@ -400,13 +727,13 @@ import {
   getDepositManagExport,
 } from "@/api/engin_deposit/refund_list";
 import { downloadFiles, handleImport } from "@/utils/util";
-import ExamineDialog from '@/components/Common/examine-dialog'
+import ExamineDialog from "@/components/Common/examine-dialog";
 
 import RefundListDetail from "./components/refund_list-detail.vue";
 export default {
   components: {
     RefundListDetail,
-    ExamineDialog
+    ExamineDialog,
   },
   data() {
     return {
@@ -444,8 +771,8 @@ export default {
         startAcceptTime: "",
         endAcceptTime: "",
         geLiInerNote: "",
-        startFactoryNo:'',
-        endFactoryNo:''
+        startFactoryNo: "",
+        endFactoryNo: "",
       }, // 搜索表单
       refundDepositArr: [
         {
@@ -487,8 +814,8 @@ export default {
       selectData: [],
       isShowExamineDialog: false,
       examineForm: {
-        status: 'OK',
-        remark: '',
+        status: "OK",
+        remark: "",
       },
     };
   },
@@ -547,47 +874,46 @@ export default {
         this.$message.error(result.message);
       }
     },
-         // 打开 批量审批
-     batchExamine() {
+    // 打开 批量审批
+    batchExamine() {
       // if (this.selectData.length) {
-        this.submitExamineForm()
-        // this.isShowExamineDialog = true;
+      this.submitExamineForm();
+      // this.isShowExamineDialog = true;
       //   return
       // }
       // this.$errorMsg('请选择审核项')
     },
     // 提交 批量审批
     submitExamineForm() {
-      let ids = this.selectData.map(item => {
+      let ids = this.selectData.map((item) => {
         return item.id;
       });
-      ids = [...new Set(ids)]
+      ids = [...new Set(ids)];
       examineData({
-        id: ids.join(','),
+        id: ids.join(","),
         examineStatus: this.examineForm.status,
         examineRemark: this.examineForm.remark,
-        serviceId:''
-      })
-        .then((res) => {
-          this.isShowExamineDialog = false;
-          this.$successMsg("修改成功");
-          this.getDataList({
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-        confirmName: "",
-        createName: "",
-        customerKeyword: "",
-        // endDeliverTime: "",
-        enginOrderNo: "",
-        enginOrderType: this.enginOrderType,
-        examineStatus: "",
-        refEnginRecordNo: "",
-        refProjectName: "",
-        refUseUnit: "",
-        ...this.screenForm,
-        // startDeliverTime: "",
+        serviceId: "",
+      }).then((res) => {
+        this.isShowExamineDialog = false;
+        this.$successMsg("修改成功");
+        this.getDataList({
+          pageSize: this.pageSize,
+          pageNum: this.currentPage,
+          confirmName: "",
+          createName: "",
+          customerKeyword: "",
+          // endDeliverTime: "",
+          enginOrderNo: "",
+          enginOrderType: this.enginOrderType,
+          examineStatus: "",
+          refEnginRecordNo: "",
+          refProjectName: "",
+          refUseUnit: "",
+          ...this.screenForm,
+          // startDeliverTime: "",
+        });
       });
-        })
     },
     //审批后更新列表数据
     updateList() {
@@ -729,7 +1055,7 @@ export default {
       const res = await getDepositManageList(data);
       res.data.records.forEach((item) => {
         item.totalPrice = item.itemPrice * item.itemQty;
-        item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty"];
+        item.sums1 = ["orderHasSendQty", "itemDataQty", "itemQty","hasSendQty"];
         item.sums2 = [
           "itemDepositAmount",
           "diffAmount",
@@ -737,8 +1063,7 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
-          "contractPrice"
-
+          "contractPrice",
         ];
       });
       this.dataList = res.data.records;

src/views/supply/price/difference_price_list.vue

@@ -0,0 +1,524 @@
+<template>
+  <div class="app-container">
+    <!-- 筛选条件 -->
+    <div>
+      <el-form
+        ref="screenForm"
+        :model="screenForm"
+        label-width="70px"
+        size="mini"
+        label-position="left"
+      >
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物料编码" prop="materialNumber">
+              <el-input
+                v-model="screenForm.materialNumber"
+                placeholder="请输入物料编码"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品名称" prop="materialName">
+              <el-input
+                v-model="screenForm.materialName"
+                placeholder="请输入产品名称"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品编码" prop="materialOldNumber">
+              <el-input
+                v-model="screenForm.materialOldNumber"
+                placeholder="请输入产品编码"
+              />
+            </el-form-item>
+          </el-col>
+          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+          <!--            <el-form-item label="生效日期" prop="startDate">-->
+          <!--              <el-date-picker-->
+          <!--                v-model="screenForm.startDate"-->
+          <!--                type="datetime"-->
+          <!--                placeholder="请输入生效日期"-->
+          <!--                value-format="yyyy-MM-dd HH:mm:ss"-->
+          <!--              >-->
+          <!--              </el-date-picker>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <!--          <el-col :xs="24" :sm="12" :lg="6">-->
+          <!--            <el-form-item label="失效日期" prop="endDate">-->
+          <!--              <el-date-picker-->
+          <!--                v-model="screenForm.endDate"-->
+          <!--                type="datetime"-->
+          <!--                placeholder="请输入生效日期"-->
+          <!--                value-format="yyyy-MM-dd HH:mm:ss "-->
+          <!--              >-->
+          <!--              </el-date-picker>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="销售类型" prop="saleTypeId">
+              <el-select
+                v-model="screenForm.saleTypeId"
+                filterable
+                placeholder="选择销售类型"
+                style="width: 100%"
+              >
+                <el-option label="全部" value="" />
+                <el-option
+                  v-for="item in ztypeList"
+                  :key="item.id"
+                  :label="item.saleName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="产品类别" prop="k3CategoryNumber">
+              <el-select
+                v-model="screenForm.k3CategoryNumber"
+                placeholder="请选择产品类别"
+              >
+                <el-option label="全部" value="" />
+                <el-option
+                  v-for="item in dictList"
+                  :label="item.name"
+                  :value="item.number"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <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="remark">
+              <el-input
+                v-model="screenForm.remark"
+                placeholder="请输入备注"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+            <el-form-item label="">
+              <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>
+      </el-form>
+    </div>
+    <!-- 按钮 -->
+    <div class="btn-group clearfix">
+      <div >
+           <el-popconfirm
+           v-if="$checkBtnRole('del', $route.meta.roles)"
+            confirm-button-text="好的"
+            cancel-button-text="不用了"
+            icon="el-icon-info"
+            icon-color="red"
+            title="内容确定删除吗？"
+            @onConfirm="handleDelete"
+          >
+            <el-button
+              type="primary"
+              size="mini"
+                icon="el-icon-delete"
+              slot="reference"
+              class="el-popover-left"
+              >删除</el-button
+            >
+          </el-popconfirm>
+          <el-button
+        type="primary"
+        style="margin-left:10px"
+              size="mini"
+          @click="handleRevokeAll"
+        >批量作废</el-button>
+<!--        <el-button type="primary" size="mini">导出</el-button>-->
+        <!-- <el-button type="primary" size="mini">打印</el-button> -->
+      </div>
+      <div class="fl">
+        <!-- <el-popconfirm
+                style="margin-right: 10px"
+                title="批量作废吗？"
+                @onConfirm="handleRevokeAll"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="mini"
+                >批量作废</el-button>
+
+                </el-popconfirm> -->
+        </div>
+    </div>
+
+
+    <div class="mymain-container">
+      <!-- 列表 -->
+      <div class="table">
+        <el-table
+          v-loading="listLoading"
+          :data="dataList"
+          element-loading-text="Loading"
+          border
+          fit
+          :row-class-name="tableRowClassName"
+             @select-all="hanleSelectAll"
+            @select="hanleSelectAll"
+        >
+           <el-table-column
+              type="selection"
+              align="left"
+              width="50"
+            ></el-table-column>
+<!--          <el-table-column type="selection" align="left" />-->
+          <!-- <el-table-column
+            align="left"
+            label="产品类别"
+            prop="mainName"
+            min-width="160"
+            show-overflow-tooltip
+          ></el-table-column> -->
+          <el-table-column
+            align="left"
+            label="物料编码"
+            prop="materialNumber"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber" />
+              <span>{{scope.row.materialNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="产品编码"
+            prop="materialOldNumber"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{scope.row.materialOldNumber}}</span>
+            </template>
+
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="产品名称"
+            prop="materialName"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{scope.row.materialName}}</span>
+            </template>
+
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="规格型号"
+            prop="specification"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.specification" />
+              <span>{{scope.row.specification}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="销售类型"
+            prop="saleTypeName"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="单位"
+            prop="unit"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="数量下限"
+            prop="qty"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="返利类型（钱包）"
+            prop="wallets"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'REBATE'">
+                  <el-tag
+                    :key="index"
+                    type="success"
+                    style="margin: 0 10px"
+                    size="mini"
+                  >
+                    {{ item.walletName }}
+                  </el-tag>
+                </template>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="现金钱包"
+            prop="modifyPriceDepartment"
+            min-width="200"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <template v-for="(item, index) in scope.row.wallets">
+                <template v-if="item.type === 'COMMONLY'">
+                  <el-tag
+                    :key="index"
+                    type="success"
+                    style="margin: 0 10px"
+                    size="mini"
+                  >
+                    {{ item.walletName }}
+                  </el-tag>
+                </template>
+              </template>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="生效日期"
+            prop="startDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+
+          <el-table-column
+            align="left"
+            label="失效日期"
+            prop="endDate"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="是否销价"
+            prop="isPromote"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tag size="mini" v-if="scope.row.isPromote" type="success">是</el-tag>
+              <el-tag size="mini" v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="left"
+            label="是否作废"
+            prop="isRevoke"
+            min-width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-tag size="mini" v-if="scope.row.isRevoke" type="success">是</el-tag>
+              <el-tag size="mini" v-else type="danger">否</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="right"
+            label="批发价1"
+            prop="batchPrice"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="right"
+            label="格力折扣"
+            prop="discAmount"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            align="left"
+            label="备注"
+            prop="remark"
+            min-width="160"
+            show-overflow-tooltip
+          />
+          <el-table-column
+            fixed="left"
+            width="150"
+            label="操作"
+            align="center"
+          >
+            <template slot-scope="scope">
+              <el-popconfirm
+                v-if="!scope.row.isRevoke"
+                style="margin-right: 10px"
+                title="作废吗？"
+                @onConfirm="handleRevoke(scope.row.id)"
+              >
+                <el-button
+                  slot="reference"
+                  type="text"
+                  size="mini"
+                >作废</el-button>
+              </el-popconfirm>
+
+              <el-button
+                v-if="$checkBtnRole('del', $route.meta.roles)"
+                type="text"
+                size="mini"
+                @click="handleDelete(scope.row.id)"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <!-- 分页 -->
+      <div class="fr">
+        <el-pagination
+          :current-page="currentPage"
+          :page-sizes="[10, 20, 30, 50]"
+          :page-size="10"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="listTotal"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Mixin from '@/mixin/index'
+import { getProductDelete, getProductPriceList, getTypeList, handlePriceRevoke } from '@/api/basic_data/material'
+import { getCategoryList } from '@/api/common'
+
+export default {
+  mixins: [Mixin],
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: [],
+      screenForm: {
+        k3CategoryNumber: '',
+        endDate: '',
+        materialName: '',
+        materialNumber: '',
+        materialOldNumber: '',
+        saleTypeId: '',
+        specification: '',
+        startDate: '',
+        remark:''
+      },
+      ztypeList: [],
+      dictList: {}
+    }
+  },
+  mounted() {
+    getCategoryList({ pageNum:1,pageSize:-1}).then((res) => {
+      this.dictList = res.data.records
+      console.log(this.dictList,777777)
+    })
+  },
+  methods: {
+    addFn() {
+      this.showDialogForm = true
+    },
+
+    handleDelete(id) {
+      this.hanleDeleteAllPromise(id).then((ids) => {
+        getProductDelete(ids).then((res) => {
+          this.$successMsg('删除成功')
+          this.getList()
+        })
+      })
+    },
+    getList() {
+      this.listLoading = true
+      const params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        k3CategoryNumber: this.screenForm.k3CategoryNumber,
+        endDate: this.screenForm.endDate,
+        materialName: this.screenForm.materialName,
+        materialNumber: this.screenForm.materialNumber,
+        materialOldNumber: this.screenForm.materialOldNumber,
+        saleTypeId: this.screenForm.saleTypeId,
+        specification: this.screenForm.specification,
+        startDate: this.screenForm.startDate,
+        remark: this.screenForm.remark,
+        billType:'HOME'
+      }
+      getProductPriceList(params).then((res) => {
+        this.dataList = res.data.records
+        console.log(res.data.records)
+        this.listTotal = res.data.total
+        this.listLoading = false
+      })
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
+        this.ztypeList = res.data.records
+        // console.log(this.ztypeList, "type1111");
+      })
+    },
+    handleRevoke(id) {
+      handlePriceRevoke({ ids:id }).then((res) => {
+        this.$successMsg('操作成功')
+        this.getList()
+      })
+    },
+    handleRevokeAll() {
+      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
+        this.$successMsg('操作成功')
+        this.getList()
+      })
+    },
+    tableRowClassName({row, rowIndex}) {
+      // || row.examineStatus=='FAIL'
+     if (this.ids.includes(row.id)) {
+          return 'warning-row';
+        }
+        return '';
+    },
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+    ::v-deep .el-table .warning-row {
+    background:  oldlace;
+  }
+
+::v-deep .el-select--small {
+  width: 100%;
+}
+::v-deep .el-date-editor {
+  width: 100%;
+}
+</style>