【修改】bug

src/api/engin_deposit/refund_list.js

@@ -70,7 +70,7 @@ export function getCommonFileGetStream(params) {
 export function examineData(params) {
   return request({
     url: "/deposit-manage/bach-condition-examine-home",
-    method: "post",
+    method: "get",
     params,
   });
 }

src/views/basic_data/material/price_list.vue

@@ -150,7 +150,7 @@
         <!-- <el-button type="primary" size="mini">打印</el-button> -->
       </div>
       <div class="fl">
-        
+
         </div>
     </div>
     <div class="mymain-container">
@@ -162,11 +162,11 @@
           element-loading-text="Loading"
           border
           fit
-       
+
           :row-class-name="tableRowClassName"
           @select-all="hanleSelectAll"
           @select="hanleSelectAll"
-         
+
         >
            <el-table-column
               type="selection"
@@ -470,7 +470,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })
@@ -482,10 +482,15 @@ export default {
       })
     },
     handleRevokeAll() {
-      handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
+      if (this.ids.length) {
+        handlePriceRevoke({ ids:this.ids.join('') }).then((res) => {
         this.$successMsg('操作成功')
         this.getList()
       })
+      }else{
+        this.$errorMsg('请选择')
+      }
+
     },
     tableRowClassName({row, rowIndex}) {
       // || row.examineStatus=='FAIL'

src/views/basic_data/stock/customer_product_list.vue

@@ -176,7 +176,7 @@
           </el-table-column>
           <el-table-column
             align="right"
-            label="可用单数量"
+            label="可开单数量"
             prop="openNumber"
             min-width="100"
             show-overflow-tooltip

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

@@ -169,6 +169,13 @@
           </div>
 
         </el-col>
+        <el-col :xs="24" :sm="24" :lg="16" class="item">
+          <div class="label">备注</div>
+          <!-- <div class="value">{{ detailList.applyNote }}</div> -->
+          <div class="value">
+            <el-input :disabled='detailList.examineStatus !== "WAIT"' v-model="detailList.remark" placeholder="请输入内容"></el-input>
+          </div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -328,7 +335,11 @@
               show-overflow-tooltip
             >
              <template slot-scope="scope">
-              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+              <template v-if="detailList.examineStatus !== 'WAIT'" >
+                {{scope.row.contractPrice}}
+              </template>
+              <el-input v-else class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+
             </template>
 
             </el-table-column>

src/views/deposit_commerce/refund_list.vue

@@ -350,6 +350,12 @@
               </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="hasSendQty" min-width="160" show-overflow-tooltip />
             <!-- <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -678,6 +684,7 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice"
         ];
       });
       this.dataList = res.data.records;

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

@@ -169,6 +169,125 @@
           </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">
+            <el-input readonly  v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </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">
+            <el-input  readonly v-model="detailList.remark" ></el-input>
+          </div>
+        </el-col>
         <!-- <el-col :xs="24" :sm="24" :lg="8" class="item">
           <div class="label">寄厂日期</div>
           <div class="value">
@@ -337,7 +456,10 @@
               show-overflow-tooltip
             >
              <template slot-scope="scope">
-              <el-input class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
+              <template v-if="detailList.examineStatus !== 'WAIT'" >
+                {{scope.row.contractPrice}}
+              </template>
+              <el-input v-else class="inpt" v-model="scope.row.contractPrice"  size="mini" clearable></el-input>
             </template>
 
             </el-table-column>

src/views/deposit_home/refund_list.vue

@@ -209,7 +209,7 @@
               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>
 
@@ -350,6 +350,12 @@
               </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="depositAmount" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -543,12 +549,12 @@ export default {
     },
          // 打开 批量审批
      batchExamine() {
-      if (this.selectData.length) {
+      // if (this.selectData.length) {
         this.submitExamineForm()
         // this.isShowExamineDialog = true;
-        return
-      }
-      this.$errorMsg('请选择审核项')
+      //   return
+      // }
+      // this.$errorMsg('请选择审核项')
     },
     // 提交 批量审批
     submitExamineForm() {
@@ -716,6 +722,8 @@ export default {
           "totalAmount",
           "depositAmount",
           "totalPrice",
+          "contractPrice"
+
         ];
       });
       this.dataList = res.data.records;

src/views/sales_policy/components/TabelTransfer.vue

@@ -142,6 +142,7 @@
              <h4 style="display: inline-block; margin-right: 20px">
                   经销商上限
        </h4>
+
   <el-divider />
     </div>
     <div style="margin: 20px 0">
@@ -397,6 +398,7 @@ export default {
       this.getPolicyList();
     }
   },
+
   methods: {
     getList() {
       this.getCrList();
@@ -510,7 +512,7 @@ export default {
         });
 
 
-         
+
 
         for (let i = 0; i < result.data.length; i++) {
           result.data[i].customerNumber = result.data[i].number;

src/views/sales_policy/components/details.vue

@@ -374,7 +374,7 @@
               </el-col>
             </el-row>
             <el-divider />
-               <el-radio-group v-model="detail.flag+''">
+               <el-radio-group v-model="detail.flag">
           <el-radio label="0" :disabled="detail.flag !=0">指定经销商</el-radio>
           <el-radio label="1" :disabled="detail.flag !=1">广州经销商</el-radio>
           <el-radio label="2" :disabled="detail.flag !=2">佛山经销商</el-radio>
@@ -603,11 +603,10 @@
         ></el-col
       >
     </el-row> -->
-     <div>
-             <h4 style="display: inline-block; margin-right: 20px">
-                  经销商上限
-       </h4>
-  <el-divider />
+     <div style="dispaly:flex">
+        <h4 style="display: inline-block; margin-right: 20px">经销商上限</h4>
+        <ExportButton  style="display: inline-block; margin-right: 20px"  :exUrl="'/policy/limit/export'" :exParams="exParams" />
+        <el-divider />
     </div>
 
     <div>
@@ -863,6 +862,11 @@ export default {
         title = '详情页'
       }
       return title
+    },
+    exParams(){
+      return {
+        policyId:this.detail.code,
+      }
     }
   },
   created() {},
@@ -875,7 +879,7 @@ export default {
       this.listLoading = true
       getPolicyDetail({ policyId: this.$parent.id }).then((res) => {
         this.detail = res.data
-
+        this.detail.flag = this.detail.flag +''
         this.srcList = [this.$imageUrl + this.detail.imgSrc]
         if (this.$parent.isShow == 5 && this.detail.imgSrc) {
           this.fileList = [

src/views/supply/engin/components/home_form.vue

@@ -497,7 +497,7 @@
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="proNum">
-              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入产品编码"></el-input>
+              <el-input v-model="goodsScreenForm.proNum" placeholder="请输入物料编码"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">

src/views/supply/price/modify_list.vue

@@ -190,7 +190,7 @@
             @select-all="hanleSelectAll"
             @select="hanleSelectAll"
             :row-class-name="tableRowClassName"
-            
+
           >
             <el-table-column
               type="selection"
@@ -841,7 +841,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  
+
   ::v-deep .el-table .warning-row {
     background:  oldlace;
   }

src/views/supply/price/price_list.vue

@@ -164,8 +164,8 @@
                 </el-popconfirm> -->
         </div>
     </div>
-           
- 
+
+
     <div class="mymain-container">
       <!-- 列表 -->
       <div class="table">
@@ -482,7 +482,7 @@ export default {
         this.listTotal = res.data.total
         this.listLoading = false
       })
-      getTypeList(params).then((res) => {
+      getTypeList({...params,pageNum:1,pageSize:-1}).then((res) => {
         this.ztypeList = res.data.records
         // console.log(this.ztypeList, "type1111");
       })

src/views/supply/reserve/reserve_list.vue

@@ -78,7 +78,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
@@ -91,8 +91,10 @@
 
       <div class="mymain-container">
         <div class="btn-group clearfix">
-          <div class="fl">
+          <div class="fl flex" >
             <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <ExportButton class="ml" :exUrl="'/reserve/download'" exText="下载模板"  />
+            <ImportButton :imUrl="'/reserve/importData'" @importSuccess="getList" />
           </div>
           <div class="fr">
             <ExportButton :exUrl="'reserve/export'" :exParams="exParams" />
@@ -101,11 +103,11 @@
         <div class="table">
           <el-table
             v-loading="listLoading"
-            :data="dataList" 
-            element-loading-text="Loading" 
-            border 
-            fit 
-            highlight-current-row 
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
             stripe
             show-summary
             :summary-method="$getSummaries">
@@ -185,9 +187,9 @@
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles)">编辑</el-button>
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
                 <el-popconfirm
-                  style="margin-left: 10px;" 
-                  title="确定关闭吗？" 
-                  @onConfirm="handleClose(scope.row.itemId)" 
+                  style="margin-left: 10px;"
+                  title="确定关闭吗？"
+                  @onConfirm="handleClose(scope.row.itemId)"
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.status === 1">
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
@@ -210,7 +212,7 @@
         </div>
       </div>
     </div>
-    
+
     <ReserveDetail :listItem="queryItem" v-if="isShowDetail" @backListFormDetail="backList" />
     <ReserveForm :listItem="queryItem" v-if="isShowForm" @backListFormDetail="backList" />
 
@@ -397,5 +399,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
+.flex{
+  display: flex;
+}
+.ml{
+  margin-left: 10px;
+}
 </style>