更新

src/utils/dict.js

@@ -242,6 +242,7 @@ export const DICT_TYPE = {
 
   // ----------检测相关------------
   INS_EQU_TYPE: 'ins_equ_type',
+  INS_NOTICE_SERVER: 'jiance',
 
   // ----------驾校相关------------
   //人员类型

src/views/base/banner/BannerManager.vue

@@ -63,7 +63,7 @@ export default {
       list: [],
       total: 0,
       queryParams:{
-        type_id: this.type
+        typeId: this.type
       }
     }
   },

src/views/inspection/inspectionGoods/index.vue

@@ -75,7 +75,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="商品标题" align="center" prop="title" />
       <el-table-column label="商品分类" align="center" prop="categoryName" />
-      <el-table-column label="合作商" align="center" prop="partnerName" />
+      <!-- <el-table-column label="合作商" align="center" prop="partnerName" /> -->
       <el-table-column label="价格（元）" align="center" prop="price" >
         <template slot-scope="scope">
         <div>{{scope.row.price/100}}</div>
@@ -214,7 +214,7 @@
           <el-input-number v-model="form.price " :precision="2" :step="0.1" :max="999999999" :min="0.01"></el-input-number>
         </el-form-item>
 <!--        合作商id-->
-        <el-form-item label="合作商" prop="price">
+        <!-- <el-form-item label="合作商" prop="price">
           <el-select v-model="form.partnerId" placeholder="请选择">
             <el-option
               v-for="item in mallPartnersList"
@@ -223,7 +223,7 @@
               :value="item.partnerId">
             </el-option>
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
 <!--        商品id-->
         <el-form-item label="商品分类" prop="price">
           <el-select v-model="form.goodsCategoryId" placeholder="请选择">
@@ -435,10 +435,10 @@
           this.total = response.data.total;
           this.loading = false;
         });
-        listMallPartners(this.hzsarr).then(response => {
-          this.mallPartnersList = response.data.records;
-          console.log('查询合作商管理列表 ',this.mallPartnersList)
-        });
+        // listMallPartners(this.hzsarr).then(response => {
+        //   this.mallPartnersList = response.data.records;
+        //   console.log('查询合作商管理列表 ',this.mallPartnersList)
+        // });
         listCategory(this.flarr).then(response => {
           this.categoryList = response.data.list;
           console.log('查询分类管理列表 ',this.categoryList)

src/views/partner/api/workOrder.js

@@ -178,3 +178,10 @@ export function getCustomerSource(params) {
     params:params
   })
 }
+export function batchSettlement(data) {
+  return request({
+    url: '/partnerOwn/partner/batchSettlement',
+    method: 'post',
+    data: data
+  })
+}

src/views/partner/form/InspectionCashierConfirmForm.vue

@@ -11,7 +11,7 @@
                   <el-input disabled v-model="orderInfo.payMoney / 100" placeholder="暂未结算"></el-input>
                 </el-form-item>
                 <el-form-item label="收费备注" prop="cashierConfirm">
-                  <el-input disabled v-model="orderInfo.remark" placeholder="暂无备注"></el-input>
+                  <el-input disabled v-model="orderInfo.payRemark" placeholder="暂无备注"></el-input>
                 </el-form-item>
                 <el-form-item label="查看附件" prop="cashierConfirm">
                   <el-button @click="handleViewFiles(orderInfo.files)">查看附件</el-button>