From bf3a148e06932416187842b03b0c1532a2b2b7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 4 Nov 2024 11:35:33 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/project/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/inspection/project/index.vue b/src/views/inspection/project/index.vue
index 678a1cc..9f57085 100644
--- a/src/views/inspection/project/index.vue
+++ b/src/views/inspection/project/index.vue
@@ -32,7 +32,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="openForm(undefined)"
-                   v-hasPermi="['inspection:dl-inspection-project:create']">新增
+                   >新增
         </el-button>
       </el-col>
       <!--      <el-col :span="1.5">-->
@@ -58,10 +58,10 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="openForm(scope.row.id)"
-                     v-hasPermi="['inspection:dl-inspection-project:update']">修改
+                     >修改
           </el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['inspection:dl-inspection-project:delete']">删除
+                     >删除
           </el-button>
         </template>
       </el-table-column>

From ba90e8c90db0a73698a85983787e9407184cf14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 5 Nov 2024 18:02:58 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/partner/api/workOrder.js |    7 +
 src/views/partner/workOrder.vue    | 1203 +++++++++++++++-------------
 2 files changed, 654 insertions(+), 556 deletions(-)

diff --git a/src/views/partner/api/workOrder.js b/src/views/partner/api/workOrder.js
index f2025b2..5963abc 100644
--- a/src/views/partner/api/workOrder.js
+++ b/src/views/partner/api/workOrder.js
@@ -136,3 +136,10 @@ export function delWorkInfo(id) {
     method: 'post'
   })
 }
+export function detail(params) {
+  return request({
+    url: '/partnerOwn/partner/inspectionDetail',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index 92bf591..a318aac 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -28,21 +28,21 @@
         </el-select>
       </el-form-item>
       <el-form-item label="支付方式" prop="payType">
-          <template slot-scope="scope">
-            <el-select
-              v-model="queryParams.payType"
-              placeholder="支付方式"
-              clearable
-              style="width: 240px"
-            >
-              <el-option
-                v-for="dict in dict.type.pay_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </template>
+        <template slot-scope="scope">
+          <el-select
+            v-model="queryParams.payType"
+            placeholder="支付方式"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="dict in dict.type.pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </template>
       </el-form-item>
       <el-form-item label="检测时间" prop="startTime">
         <el-date-picker
@@ -75,30 +75,32 @@
       </el-form-item>
     </el-form>
     <el-row :gutter="10" class="mb8">
-    <el-col :span="1.5">
-      <el-button
-        type="primary"
-        plain
-        icon="el-icon-plus"
-        size="mini"
-        @click="handleAdd"
-      >录入</el-button>
-    </el-col>
-    <el-col :span="1.5">
-      <el-button
-        type="primary"
-        plain
-        icon="el-icon-download"
-        size="mini"
-        @click="handleExport"
-      >导出</el-button>
-    </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >录入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出
+        </el-button>
+      </el-col>
       <div style="margin-left: 72%;font-weight: bold">
       <span>
-         公示价格汇总：{{moneyData.goodsPriceSum/100}} 元
+         公示价格汇总：{{ moneyData.goodsPriceSum / 100 }} 元
       </span>
         <span style="margin-left: 3%">
-      实付金额汇总：{{moneyData.payMoneySum/100}} 元
+      实付金额汇总：{{ moneyData.payMoneySum / 100 }} 元
       </span>
 
       </div>
@@ -106,24 +108,24 @@
 
 
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="车牌号" align="center" prop="carNum" />
-      <el-table-column label="检测类型" align="center" prop="goodsTitle" />
-      <el-table-column label="检测项目" align="center" prop="skuName" />
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="车牌号" align="center" prop="carNum"/>
+      <el-table-column label="检测类型" align="center" prop="goodsTitle"/>
+      <el-table-column label="检测项目" align="center" prop="skuName"/>
       <el-table-column label="公示价格" align="center" prop="realPayMoney">
         <template slot-scope="scope">
-          <span>{{scope.row.goodsPrice/100}}</span>
+          <span>{{ scope.row.goodsPrice / 100 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="实收金额" align="center" prop="realPayMoney">
         <template slot-scope="scope">
-          <span>{{scope.row.realPayMoney/100}}</span>
+          <span>{{ scope.row.realPayMoney / 100 }}</span>
         </template>
       </el-table-column>
       <el-table-column label="收款时间" align="center" prop="payTime"/>
-<!--      <el-table-column label="客户" align="center" prop="buyName" />-->
-      <el-table-column label="客户手机号" align="center" prop="buyPhone" />
-<!--      <el-table-column label="接待员" align="center" prop="workerName"/>-->
+      <!--      <el-table-column label="客户" align="center" prop="buyName" />-->
+      <el-table-column label="客户手机号" align="center" prop="buyPhone"/>
+      <!--      <el-table-column label="接待员" align="center" prop="workerName"/>-->
       <el-table-column label="接待员手机号" align="center" prop="workerPhone"/>
       <el-table-column label="客户来源" align="center" prop="customerSource">
       </el-table-column>
@@ -136,7 +138,7 @@
       <el-table-column label="结束时间" align="center" prop="endTime"/>
       <el-table-column label="检测结果" align="center" prop="isPass">
         <template slot-scope="scope">
-        <span v-if="scope.row.isPass =='0'">不合格</span>
+          <span v-if="scope.row.isPass =='0'">不合格</span>
           <span v-else-if="scope.row.isPass =='1'">合格</span>
           <span v-else>进行中</span>
         </template>
@@ -149,13 +151,15 @@
             type="text"
             icon="el-icon-edit"
             @click="watchWork(scope.row)"
-          >打印</el-button>
+          >打印
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="xinWork(scope.row)"
-          >结算</el-button>
+          >结算
+          </el-button>
           <el-button
             size="mini"
             type="text"
@@ -163,26 +167,38 @@
             v-if="scope.row.status&&scope.row.status == 1&&scope.row.isPass&&scope.row.isPass ==1&&scope.row.makeCert!=1"
 
             @click="zhizheng(scope.row)"
-          >制证</el-button>
+          >制证
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+
+            @click="detail(scope.row)"
+          >详情
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             v-if="scope.row.status&&scope.row.status == 0"
             @click="jieshu(scope.row)"
-          >完工</el-button>
+          >完工
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-          >修改</el-button>
+          >修改
+          </el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleDelete(scope.row)"
-          >删除</el-button>
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -198,109 +214,122 @@
     <!-- 添加或修改道路救援模块对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="900px" append-to-body>
 
-     <div v-html="htmlStr" id ="printMe"> </div>
+      <div v-html="htmlStr" id="printMe"></div>
 
-      <el-button type="primary" style="margin-left: 90%;margin-top:20px " v-print="'#printMe'" size="small">打印</el-button>
+      <el-button type="primary" style="margin-left: 90%;margin-top:20px " v-print="'#printMe'" size="small">打印
+      </el-button>
 
     </el-dialog>
-<!--  弹窗  -->
+    <!--  弹窗  -->
     <el-dialog :title="title" :visible.sync="openhe" width="600px" append-to-body>
       <el-form ref="form" :model="offline" :rules="rules" label-width="120px">
 
-       <div style="box-sizing: border-box;padding-left: 120px;margin: 10px auto">
-         <el-select v-model="isPass" placeholder="是否合格">
-           <el-option
-             v-for="item in optionss"
-             :key="item.value"
-             :label="item.label"
-             :value="item.value">
-           </el-option>
-         </el-select>
-       </div>
-      <div v-if="isPass == 0" style="box-sizing: border-box;padding-left: 120px;margin: 10px auto">
-        <el-select v-model="isRetrial" placeholder="重审/退办">
-          <el-option
-            v-for="item in optionsss"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </div>
+        <div style="box-sizing: border-box;padding-left: 120px;margin: 10px auto">
+          <el-select v-model="isPass" placeholder="是否合格">
+            <el-option
+              v-for="item in optionss"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="isPass == 0" style="box-sizing: border-box;padding-left: 120px;margin: 10px auto">
+          <el-select v-model="isRetrial" placeholder="重审/退办">
+            <el-option
+              v-for="item in optionsss"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
 
 
-      <div style="margin-top: 10px">
-        <el-form-item label="说明" >
-          <el-input type="text" v-model="remark"></el-input>
-        </el-form-item>
-      </div>
+        <div style="margin-top: 10px">
+          <el-form-item label="说明">
+            <el-input type="text" v-model="remark"></el-input>
+          </el-form-item>
+        </div>
         <el-button type="primary" @click="jieshutij()">确定</el-button>
       </el-form>
     </el-dialog>
 
     <el-dialog :title="title" :visible.sync="openxin" width="800px" append-to-body>
       <el-form ref="form" :model="offline" :rules="rules" label-width="120px">
-      <el-form-item label="商品价格" >
-        <span>{{goodsPrice/100}}</span>
-      </el-form-item>
-      <el-form-item label="优惠金额" >
-        <el-input-number :min="0" @input="jisuan" :max="goodsPrice/100" type="text" v-model="reduceMoney"></el-input-number>
-      </el-form-item>
-      <el-form-item label="实付金额" >
-        <el-input-number type="text" v-model="payMoney"></el-input-number>
-      </el-form-item>
-      <el-form-item label="付款方式" >
-<!--        <el-input type="text" v-model="receivablesAccount"></el-input>-->
-        <el-select v-model="payType" placeholder="请选择付款方式">
-          <el-option
-            v-for="dict in dict.type.pay_type"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="收款账号" >
-        <el-select  v-model="receivablesAccount" placeholder="请选择收款账号">
-        <el-option
-          v-for="item in BankAccountList"
-          :key="item.key"
-          :label="item.key"
+        <el-form-item label="商品价格">
+          <span>{{ goodsPrice / 100 }}</span>
+        </el-form-item>
+        <el-form-item label="优惠金额">
+          <el-input-number :min="0" @input="jisuan" :max="goodsPrice/100" type="text"
+                           v-model="reduceMoney"></el-input-number>
+        </el-form-item>
+        <el-form-item label="实付金额">
+          <el-input-number type="text" v-model="payMoney"></el-input-number>
+        </el-form-item>
+        <el-form-item label="付款方式">
+          <!--        <el-input type="text" v-model="receivablesAccount"></el-input>-->
+          <el-select v-model="payType" placeholder="请选择付款方式">
+            <el-option
+              v-for="dict in dict.type.pay_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="收款账号">
+          <el-select v-model="receivablesAccount" placeholder="请选择收款账号">
+            <el-option
+              v-for="item in BankAccountList"
+              :key="item.key"
+              :label="item.key"
 
-        ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="备注" >
-        <el-input type="text" v-model="payRemark"></el-input>
-      </el-form-item>
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input type="text" v-model="payRemark"></el-input>
+        </el-form-item>
         <el-button type="primary" @click="tijiao()">确 定</el-button>
       </el-form>
     </el-dialog>
+    <el-dialog :title="title" :visible.sync="opendetail" width="800px" append-to-body class="custom-dialog">
+      <div v-for="(item, index) in detailForm" :key="index" class="dialog-item">
+        <div class="item-header">
+          <span class="item-title">{{ item.title }}</span>
+          <span class="item-create-time">{{ item.createTime }}</span>
+        </div>
+        <div class="item-content">
+          <span>{{ item.content }}</span>
+        </div>
+      </div>
+    </el-dialog>
     <el-dialog :title="title" :visible.sync="addOpen" width="600px" append-to-body>
 
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="客户姓名" >
+        <el-form-item label="客户姓名">
           <el-input type="text" v-model="form.buyName"></el-input>
         </el-form-item>
-        <el-form-item label="联系方式" >
+        <el-form-item label="联系方式">
           <el-input type="text" v-model="form.buyPhone"></el-input>
         </el-form-item>
-        <el-form-item label="号牌号码" >
+        <el-form-item label="号牌号码">
           <el-input type="text" v-model="form.carNum"></el-input>
         </el-form-item>
-        <el-form-item label="品牌型号" >
+        <el-form-item label="品牌型号">
           <el-input type="text" v-model="form.carModel"></el-input>
         </el-form-item>
-        <el-form-item label="车辆识别代号" >
+        <el-form-item label="车辆识别代号">
           <el-input type="text" v-model="form.carIdNo"></el-input>
         </el-form-item>
-        <el-form-item label="住址" >
+        <el-form-item label="住址">
           <el-input type="text" v-model="form.userAddress"></el-input>
         </el-form-item>
-        <el-form-item label="单位" >
+        <el-form-item label="单位">
           <el-input type="text" v-model="form.unitName"></el-input>
         </el-form-item>
-        <el-form-item label="使用性质" >
+        <el-form-item label="使用性质">
 
           <el-select v-model="form.carNature" placeholder="请选择使用性质">
             <el-option
@@ -311,7 +340,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="请选择客户来源" >
+        <el-form-item label="请选择客户来源">
           <el-select v-model="form.customerSource" placeholder="请选择客户来源">
             <el-option
               v-for="dict in customerData"
@@ -322,13 +351,13 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="选择商品" >
+        <el-form-item label="选择商品">
           <el-cascader
             v-model="form.skuId"
             :options="options"
             @change="handleChange"></el-cascader>
         </el-form-item>
-        <el-form-item label="新旧车" >
+        <el-form-item label="新旧车">
           <el-select v-model="form.carStatus" placeholder="请选择客户来源">
             <el-option
               v-for="dict in dict.type.car_status"
@@ -350,472 +379,534 @@
 </template>
 
 <script>
-  import { listWorkOrder,workOrderData,listGoods,addWorkInfo,getWorker,shopInfo,settleAccounts,
-    workOrderView,inspectionDetail,offlineCharging,
-    getBankAccountList,makeCertOk,stopInspection,updateWorkInfo,delWorkInfo} from "./api/workOrder";
-  import { getCustomerSource } from "./api/index";
-  import print from 'vue-print-nb'
-  import moment from 'moment';
-  import request from "@/utils/request";
-  import DictTag from "@/components/DictTagOld/index.vue";
+import {
+  listWorkOrder, workOrderData, listGoods, addWorkInfo, getWorker, shopInfo, settleAccounts,
+  workOrderView, inspectionDetail, offlineCharging,
+  getBankAccountList, makeCertOk, stopInspection, updateWorkInfo, delWorkInfo, detail
+} from "./api/workOrder";
+import {getCustomerSource} from "./api/index";
+import print from 'vue-print-nb'
+import moment from 'moment';
+import request from "@/utils/request";
+import DictTag from "@/components/DictTagOld/index.vue";
 
-  export default {
-    name: "Info",
-    dicts: ['customer_source','pay_type','car_status','car_use_nature','inspection_use_role'],
-    directives: {
-      print
-    },
-    components:{DictTag},
-    data() {
-      return {
-        moneyData:{
-          payMoneySum:0,
-          goodsPriceSum:0
-        },
-        isPass:1,
-        isRetrial:'',
-        remark:'',
-        optionss: [{
-          value: '1',
-          label: '合格'
-        }, {
-          value: '0',
-          label: '不合格'
-        }],
-        optionsss: [{
-          value: '1',
-          label: '重审'
-        }, {
-          value: '0',
-          label: '退办理'
-        }],
+export default {
+  name: "Info",
+  dicts: ['customer_source', 'pay_type', 'car_status', 'car_use_nature', 'inspection_use_role'],
+  directives: {
+    print
+  },
+  components: {DictTag},
+  data() {
+    return {
+      moneyData: {
+        payMoneySum: 0,
+        goodsPriceSum: 0
+      },
+      isPass: 1,
+      isRetrial: '',
+      remark: '',
+      optionss: [{
+        value: '1',
+        label: '合格'
+      }, {
+        value: '0',
+        label: '不合格'
+      }],
+      optionsss: [{
+        value: '1',
+        label: '重审'
+      }, {
+        value: '0',
+        label: '退办理'
+      }],
 
-        goodsPrice:0,
-        reduceMoney:'',
-        payMoney:'',
-        payType:'',
-        receivablesAccount:'',
-        payRemark:'',
-        inspectionId:'',
-        size:'',
-        workId:'',
-        // workerList:[],
-        value: '',
-        options:[],
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        customerData:[],
-        BankAccountList:[],
-        // 总条数
-        total: 0,
-        // 道路救援模块表格数据
-        infoList: [],
-        // 弹出层标题
-        title: "",
-        addOpen:false,
-        // 是否显示弹出层
-        open: false,
-        openxin:false,
-        openhe:false,
-        htmlStr:null,
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          connectionName: null,
-          isAppointment: null,
-          rescueType: null,
-          feeType: null,
-          carBrand: null,
-          destinationInfo: null,
-          rescueStatus: null,
-          rescueAmount: null,
-        },
-        // 表单参数
-        form: {},
-        offline:{},
-        // 表单校验
-        rules: {
-          connectionName: [
-            { required: true, message: "联系人名称不能为空", trigger: "blur" }
-          ],
-          connectionPhone: [
-            { required: true, message: "联系人手机号不能为空", trigger: "blur" }
-          ],
-          licenseNum: [
-            { required: true, message: "车牌号不能为空", trigger: "blur" }
-          ],
-          isAppointment: [
-            { required: true, message: "是否为预约单不能为空", trigger: "change" }
-          ],
-          rescueType: [
-            { required: true, message: "救援类型 1拖车2送油3搭电4换台5扣车不能为空", trigger: "change" }
-          ],
-          carType: [
-            { required: true, message: "车辆类型  大中小不能为空", trigger: "change" }
-          ],
-          rescuePosition: [
-            { required: true, message: "救援地点 详细描述不能为空", trigger: "blur" }
-          ],
-          feeType: [
-            { required: true, message: "收费类型不能为空", trigger: "change" }
-          ],
-        }
-      };
-    },
-    created() {
-      this.dict = {type:{}}
-      for (let i = 0; i < this.$options.dicts.length; i++) {
-        request({
-          url: '/rescue/dict/data/type/'+this.$options.dicts[i],
-          method: 'get'
-        }).then(res=>{
-          this.$set(this.dict.type,this.$options.dicts[i],res.data)
-        })
+      goodsPrice: 0,
+      reduceMoney: '',
+      payMoney: '',
+      payType: '',
+      receivablesAccount: '',
+      payRemark: '',
+      inspectionId: '',
+      size: '',
+      workId: '',
+      // workerList:[],
+      value: '',
+      options: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      customerData: [],
+      BankAccountList: [],
+      // 总条数
+      total: 0,
+      // 道路救援模块表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      addOpen: false,
+      // 是否显示弹出层
+      open: false,
+      openxin: false,
+      opendetail: false,
+      openhe: false,
+      htmlStr: null,
+      detailForm: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        connectionName: null,
+        isAppointment: null,
+        rescueType: null,
+        feeType: null,
+        carBrand: null,
+        destinationInfo: null,
+        rescueStatus: null,
+        rescueAmount: null,
+      },
+      // 表单参数
+      form: {},
+      offline: {},
+      // 表单校验
+      rules: {
+        connectionName: [
+          {required: true, message: "联系人名称不能为空", trigger: "blur"}
+        ],
+        connectionPhone: [
+          {required: true, message: "联系人手机号不能为空", trigger: "blur"}
+        ],
+        licenseNum: [
+          {required: true, message: "车牌号不能为空", trigger: "blur"}
+        ],
+        isAppointment: [
+          {required: true, message: "是否为预约单不能为空", trigger: "change"}
+        ],
+        rescueType: [
+          {required: true, message: "救援类型 1拖车2送油3搭电4换台5扣车不能为空", trigger: "change"}
+        ],
+        carType: [
+          {required: true, message: "车辆类型  大中小不能为空", trigger: "change"}
+        ],
+        rescuePosition: [
+          {required: true, message: "救援地点 详细描述不能为空", trigger: "blur"}
+        ],
+        feeType: [
+          {required: true, message: "收费类型不能为空", trigger: "change"}
+        ],
       }
-     this.getpid()
-      this.customerSource();
+    };
+  },
+  created() {
+    this.dict = {type: {}}
+    for (let i = 0; i < this.$options.dicts.length; i++) {
+      request({
+        url: '/rescue/dict/data/type/' + this.$options.dicts[i],
+        method: 'get'
+      }).then(res => {
+        this.$set(this.dict.type, this.$options.dicts[i], res.data)
+      })
+    }
+    this.getpid()
+    this.customerSource();
+  },
+  methods: {
+    jieshutij() {
+      let data = {
+        id: this.inspectionId,
+        isPass: this.isPass,
+        isRetrial: this.isRetrial,
+        remark: this.remark
+      }
+      stopInspection(data).then(res => {
+        console.log(res)
+        this.$message.success("操作成功")
+        this.openhe = false
+        this.getList()
+      })
     },
-    methods: {
-      jieshutij(){
-        let data = {
-          id:this.inspectionId,
-          isPass:this.isPass,
-          isRetrial:this.isRetrial,
-          remark:this.remark
-        }
-        stopInspection(data).then(res=>{
-          console.log(res)
-          this.$message.success("操作成功")
-          this.openhe = false
-          this.getList()
-        })
-      },
-      jieshu(row){
+    jieshu(row) {
 
-        this.inspectionId = row.id
-        this.isPass="",
-          this.isRetrial="",
-          this.remark="",
+      this.inspectionId = row.id
+      this.isPass = "",
+        this.isRetrial = "",
+        this.remark = "",
         this.openhe = true
-      },
-      zhizheng(row){
-        console.log(row)
-        let data = {
-          inspectionId: row.id
-        }
-        makeCertOk(data).then(res=>{
+    },
+    zhizheng(row) {
+      console.log(row)
+      let data = {
+        inspectionId: row.id
+      }
+      makeCertOk(data).then(res => {
 
-          this.$message.success("操作成功")
+        this.$message.success("操作成功")
+        this.getList()
+      })
+    },
+    jisuan() {
+      if (this.reduceMoney > (this.goodsPrice / 100)) {
+        this.reduceMoney = this.goodsPrice / 100
+      }
+      this.payMoney = (this.goodsPrice / 100) - this.reduceMoney
+    },
+    tijiao() {
+      let data = {
+        reduceMoney: this.reduceMoney ? this.reduceMoney * 100 : 0,
+        payMoney: this.payMoney * 100,
+        payType: this.payType,
+        receivablesAccount: this.receivablesAccount,
+        payRemark: this.payRemark,
+        inspectionId: this.inspectionId,
+      }
+      offlineCharging(data).then(res => {
+        this.openxin = false
+        this.$message.success("结算成功")
+        this.getList()
+      })
+
+    },
+
+    settleAccounts(id) {
+      settleAccounts(id).then(res => {
+        if (res.code == 0) {
+          this.$message.success("清算成功")
           this.getList()
-        })
-      },
-      jisuan(){
-        if(this.reduceMoney>(this.goodsPrice/100)){
-          this.reduceMoney = this.goodsPrice/100
         }
-        this.payMoney =	(this.goodsPrice/100)- this.reduceMoney
-      },
-      tijiao(){
-        let data = {
-          reduceMoney:this.reduceMoney?this.reduceMoney*100:0,
-          payMoney:this.payMoney*100,
-          payType:this.payType,
-          receivablesAccount:this.receivablesAccount,
-          payRemark:this.payRemark,
-          inspectionId:this.inspectionId,
-        }
-        offlineCharging(data).then(res=>{
-          this.openxin = false
-          this.$message.success("结算成功")
-          this.getList()
-        })
-
-      },
-
-      settleAccounts(id){
-        settleAccounts(id).then(res=>{
-          if (res.code == 0){
-            this.$message.success("清算成功")
-            this.getList()
-          }
-        })
-      },
-      customerSource(){
-        getCustomerSource().then(res=>{
-          this.customerData  = res.data
-        })
-      },
-      watchWork(row){
-        workOrderView(row.id).then(res=>{
+      })
+    },
+    customerSource() {
+      getCustomerSource().then(res => {
+        this.customerData = res.data
+      })
+    },
+    watchWork(row) {
+      workOrderView(row.id).then(res => {
         this.htmlStr = res.data
-        })
+      })
       this.open = true
-        this.form = row
-        this.open = true
-      },
-      xinWork(row){
-        this.inspectionId = row.id
-        this.reduceMoney=0,
-         this.payMoney=null,
-         this.payType=null,
-          this.receivablesAccount=null,
-          this.payRemark=null,
-        inspectionDetail(row.id).then(res=>{
+      this.form = row
+      this.open = true
+    },
+    xinWork(row) {
+      this.inspectionId = row.id
+      this.reduceMoney = 0,
+        this.payMoney = null,
+        this.payType = null,
+        this.receivablesAccount = null,
+        this.payRemark = null,
+        inspectionDetail(row.id).then(res => {
           this.offline = res.data
           this.goodsPrice = res.data.goodsPrice
           console.log(res)
         })
-        this.openxin = true
-      },
+      this.openxin = true
+    },
+    detail(row) {
+      console.log('点击详情', row)
+      //根据id查询详情
+      let params = {
+        inspectionInfoId: row.id
+      }
+      detail(params).then(res => {
+        this.detailForm = res.data.stepInfos
+        console.log('详情', this.detailForm)
+      })
+      this.opendetail = true
+    },
 
-      //获取pid
-      getpid(){
-        shopInfo().then(res=>{
-          this.partnerId = res.data.partnerId
-          this.getList();
-
-        })
-      },
-      handleChanges(e){
-
-        console.log('执行了查询',e)
-      },
-      handleChange(e){
-        console.log(e)
-      },
-      /** 查询道路救援模块列表 */
-      getList() {
-        this.loading = true;
-        console.log(this.queryParams.jcTime)
-        if (this.queryParams.jcTime){
-          this.queryParams.startTime = this.queryParams.jcTime[0]
-          this.queryParams.endTime = this.queryParams.jcTime[1]
-        }
-        listWorkOrder(this.queryParams).then(response => {
-          this.infoList = response.data.records;
-          this.total = response.data.total;
-          this.loading = false;
-        });
-        workOrderData(this.queryParams).then(response => {
-          this.moneyData = response.data
-        });
-        let data = {
-          partnerId:this.partnerId,
-          workName:this.value,
-          pageNum:1,
-          pageSize:100,
-        }
-        // getWorker(data).then(res =>{
-        //   console.log(res)
-        //   this.workerList =  res.rows
-        // })
-        getBankAccountList().then(res=>{
-          res.data.forEach(it=>{
-            let temp={}
-            temp.key = it.remark+it.dictLabel
-            this.BankAccountList.push(temp)
-          })
-        })
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        this.addOpen = false;
-        this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          id: null,
-          connectionName: null,
-          connectionPhone: null,
-          licenseNum: null,
-          isAppointment: null,
-          rescueTime: null,
-          rescueType: null,
-          carType: null,
-          rescuePosition: null,
-          rescueLongitude: null,
-          rescueLatitude: null,
-          feeType: null,
-          carBrand: null,
-          destinationInfo: null,
-          destinationLongitude: null,
-          destinationLatitude: null,
-          rescueStatus: null,
-          driverId: null,
-          rescueAmount: null,
-          createTime: null,
-          createBy: null,
-          updateTime: null,
-          updateBy: null,
-        };
-        this.resetForm("form");
-      },
-
-
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
+    //获取pid
+    getpid() {
+      shopInfo().then(res => {
+        this.partnerId = res.data.partnerId
         this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.queryParams.jcTime = null
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.ids = selection.map(item => item.id)
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      /** 新增按钮操作 */
-      handleAdd() {
-        listGoods().then(res=>{
-          res.data.forEach(it=>{
-            let temp={}
-            temp.value = it.id;
-            temp.label = it.title;
-            let temp1=[]
-            it.skuList.forEach(item=>{
-              let temp2={}
-              temp2.value = item.id;
-              temp2.label = item.skuName;
-              temp1.push(temp2)
-            })
-            temp.children = temp1
-            this.options.push(temp)
-          })
-          console.log(this.options)
-        })
-        this.reset();
-        this.addOpen = true;
-        this.title = "工单";
-      },
-      /** 修改按钮操作 */
-      handleUpdate(row) {
-        this.reset();
-        this.form = row
-        let skuId = parseInt(row.skuId)
-        this.form.skuId = [row.goodsId,skuId]
-        console.log( this.form)
-        listGoods().then(res=>{
-          res.data.forEach(it=>{
-            let temp={}
-            temp.value = it.id;
-            temp.label = it.title;
-            let temp1=[]
-            it.skuList.forEach(item=>{
-              let temp2={}
-              temp2.value = item.id;
-              temp2.label = item.skuName;
-              temp1.push(temp2)
-            })
-            temp.children = temp1
-            this.options.push(temp)
-          })
-          console.log(this.options)
-        })
 
-        this.addOpen = true;
-        this.title = "工单";
-      },
-      /** 提交按钮 */
-      submitForm() {
-        if ( this.form.id){
-          this.updateForm()
-        }else {
-          this.$refs["form"].validate(valid => {
-            if (valid) {
-              console.log(this.form.skuId[1])
-              this.form.skuId = this.form.skuId[1]
-              addWorkInfo(this.form).then(response => {
-                this.$modal.msgSuccess("新增成功");
-                this.addOpen = false;
-                this.getList();
-              });
-            }
-          });
-        }
+      })
+    },
+    handleChanges(e) {
 
-      },
-      updateForm() {
+      console.log('执行了查询', e)
+    },
+    handleChange(e) {
+      console.log(e)
+    },
+    /** 查询道路救援模块列表 */
+    getList() {
+      this.loading = true;
+      console.log(this.queryParams.jcTime)
+      if (this.queryParams.jcTime) {
+        this.queryParams.startTime = this.queryParams.jcTime[0]
+        this.queryParams.endTime = this.queryParams.jcTime[1]
+      }
+      listWorkOrder(this.queryParams).then(response => {
+        this.infoList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+      workOrderData(this.queryParams).then(response => {
+        this.moneyData = response.data
+      });
+      let data = {
+        partnerId: this.partnerId,
+        workName: this.value,
+        pageNum: 1,
+        pageSize: 100,
+      }
+      // getWorker(data).then(res =>{
+      //   console.log(res)
+      //   this.workerList =  res.rows
+      // })
+      getBankAccountList().then(res => {
+        res.data.forEach(it => {
+          let temp = {}
+          temp.key = it.remark + it.dictLabel
+          this.BankAccountList.push(temp)
+        })
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.addOpen = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        connectionName: null,
+        connectionPhone: null,
+        licenseNum: null,
+        isAppointment: null,
+        rescueTime: null,
+        rescueType: null,
+        carType: null,
+        rescuePosition: null,
+        rescueLongitude: null,
+        rescueLatitude: null,
+        feeType: null,
+        carBrand: null,
+        destinationInfo: null,
+        destinationLongitude: null,
+        destinationLatitude: null,
+        rescueStatus: null,
+        driverId: null,
+        rescueAmount: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+      };
+      this.resetForm("form");
+    },
+
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.jcTime = null
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      listGoods().then(res => {
+        res.data.forEach(it => {
+          let temp = {}
+          temp.value = it.id;
+          temp.label = it.title;
+          let temp1 = []
+          it.skuList.forEach(item => {
+            let temp2 = {}
+            temp2.value = item.id;
+            temp2.label = item.skuName;
+            temp1.push(temp2)
+          })
+          temp.children = temp1
+          this.options.push(temp)
+        })
+        console.log(this.options)
+      })
+      this.reset();
+      this.addOpen = true;
+      this.title = "工单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.form = row
+      let skuId = parseInt(row.skuId)
+      this.form.skuId = [row.goodsId, skuId]
+      console.log(this.form)
+      listGoods().then(res => {
+        res.data.forEach(it => {
+          let temp = {}
+          temp.value = it.id;
+          temp.label = it.title;
+          let temp1 = []
+          it.skuList.forEach(item => {
+            let temp2 = {}
+            temp2.value = item.id;
+            temp2.label = item.skuName;
+            temp1.push(temp2)
+          })
+          temp.children = temp1
+          this.options.push(temp)
+        })
+        console.log(this.options)
+      })
+
+      this.addOpen = true;
+      this.title = "工单";
+    },
+    /** 提交按钮 */
+    submitForm() {
+      if (this.form.id) {
+        this.updateForm()
+      } else {
         this.$refs["form"].validate(valid => {
           if (valid) {
             console.log(this.form.skuId[1])
             this.form.skuId = this.form.skuId[1]
-            updateWorkInfo(this.form).then(response => {
-              this.$modal.msgSuccess("成功");
+            addWorkInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
               this.addOpen = false;
               this.getList();
             });
           }
         });
-      },
-      /** 删除按钮操作 */
-      handleDelete(row) {
-        const ids = row.id || this.ids;
-        this.$modal.confirm('是否确认删除？').then(function() {
-          return delWorkInfo(ids);
-        }).then(() => {
-          this.getList();
-          this.$modal.msgSuccess("删除成功");
-        }).catch(() => {});
-      },
-      /** 导出按钮操作 */
-      handleExport() {
-        this.download('/system/inspectionMallPartners/exportWorkOrder', {
-          ...this.queryParams
-        }, `info_${new Date().getTime()}.xlsx`)
       }
+
+    },
+    updateForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          console.log(this.form.skuId[1])
+          this.form.skuId = this.form.skuId[1]
+          updateWorkInfo(this.form).then(response => {
+            this.$modal.msgSuccess("成功");
+            this.addOpen = false;
+            this.getList();
+          });
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除？').then(function () {
+        return delWorkInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('/system/inspectionMallPartners/exportWorkOrder', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
     }
-  };
+  }
+};
 </script>
 <style media="print">
-  @page {size: auto; /* auto is the initial value */margin: 3mm; /* this affects the margin in the printer settings */
-  }
-  .w-box{
-    width: 750px;
-    margin: 10px auto;
-    border: 2px solid #8799a3;
-    border-radius:4px;
-    box-sizing: border-box;
-    padding: 10px;
-    font-size: 22px;
-    font-weight: bold;
+@page {
+  size: auto; /* auto is the initial value */
+  margin: 3mm; /* this affects the margin in the printer settings */
+}
 
-  }
-  .box-dis{
-    width: 100%;
-    display: flex;
-    margin: 25px 0px;
-    justify-content: space-between;
+.w-box {
+  width: 750px;
+  margin: 10px auto;
+  border: 2px solid #8799a3;
+  border-radius: 4px;
+  box-sizing: border-box;
+  padding: 10px;
+  font-size: 22px;
+  font-weight: bold;
 
-  }
-  .ws-box{
-    width: 50%;
-    display: flex;
-    align-items: center;
-  }
-  .w-left{
-    width: 40%;
-  }
-  .w-rghit{
-    width: 60%;
-  }
-  .dazi{
-    font-size: 22px;
-    font-weight: bold;
-  }
+}
+
+.box-dis {
+  width: 100%;
+  display: flex;
+  margin: 25px 0px;
+  justify-content: space-between;
+
+}
+
+.ws-box {
+  width: 50%;
+  display: flex;
+  align-items: center;
+}
+
+.w-left {
+  width: 40%;
+}
+
+.w-rghit {
+  width: 60%;
+}
+
+.dazi {
+  font-size: 22px;
+  font-weight: bold;
+}
+* 对话框整体样式 */
+.custom-dialog {
+  border-radius: 8px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+}
+
+/* 每个对话框项的样式 */
+.dialog-item {
+  margin-bottom: 20px;
+  padding: 10px;
+  border-bottom: 1px solid #e4e7ed;
+}
+
+/* 标题和创建时间的容器 */
+.item-header {
+  display: flex;
+  justify-content: space-between;
+  font-size: 16px;
+  color: #333;
+}
+
+/* 标题样式 */
+.item-title {
+  font-weight: bold;
+}
+
+/* 创建时间样式 */
+.item-create-time {
+  color: #999;
+}
+
+/* 内容样式 */
+.item-content {
+  margin-top: 10px;
+  font-size: 14px;
+  color: #666;
+}
 </style>

From 7881c6022b541b55468d025f3cb3f604d1c471b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 7 Nov 2024 09:20:25 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/partner/shopadministration/shopadministration.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/partner/shopadministration/shopadministration.vue b/src/views/partner/shopadministration/shopadministration.vue
index ae46280..c112288 100644
--- a/src/views/partner/shopadministration/shopadministration.vue
+++ b/src/views/partner/shopadministration/shopadministration.vue
@@ -449,7 +449,8 @@
       getList() {
         this.loading = true;
         listInspectionGoods(this.queryParams).then(response => {
-          this.inspectionGoodsList = response.rows;
+          console.log('resp',response)
+          this.inspectionGoodsList = response.data.records;
           this.inspectionGoodsList.price=this.inspectionGoodsList.price / 100
           this.total = response.total;
           this.loading = false;

From 70fe5aebc95ed5f039dc049a7d3a08797a492f2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 7 Nov 2024 14:50:34 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AD=90=E8=A1=A8=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=B5=8B=E5=B7=A5=E5=8D=95=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E6=98=BE=E7=A4=BA=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inspection/project/index.js           | 12 ++++
 .../project/DlInspectionProjectForm.vue       | 56 ++++++++++++++++++-
 src/views/inspection/project/index.vue        |  3 +-
 src/views/partner/workOrder.vue               | 20 +++----
 4 files changed, 77 insertions(+), 14 deletions(-)

diff --git a/src/api/inspection/project/index.js b/src/api/inspection/project/index.js
index cc0de69..a5295f4 100644
--- a/src/api/inspection/project/index.js
+++ b/src/api/inspection/project/index.js
@@ -61,3 +61,15 @@ export function getRole(params) {
     },
   })
 }
+
+// 获取商品 Excel
+export function getGoods(params) {
+  return request({
+    url: 'system/inspectionGoods/listPartnerGoods',
+    method: 'get',
+    params: {
+      pageNum: 1,
+      pageSize: 10000
+    },
+  })
+}
diff --git a/src/views/inspection/project/DlInspectionProjectForm.vue b/src/views/inspection/project/DlInspectionProjectForm.vue
index 14658e0..c5d9433 100644
--- a/src/views/inspection/project/DlInspectionProjectForm.vue
+++ b/src/views/inspection/project/DlInspectionProjectForm.vue
@@ -19,6 +19,17 @@
         <el-form-item label="备注" prop="remark">
           <el-input v-model="formData.remark" placeholder="请输入备注"/>
         </el-form-item>
+        <el-form-item label="提成价格">
+          <el-table :data="tableData" style="width: 100%" height="250">
+            <el-table-column fixed prop="title" label="商品名称">
+            </el-table-column>
+            <el-table-column label="提成价格">
+              <template #default="scope">
+                <el-input v-model="scope.row.royaltyAmount" placeholder="输入价格"></el-input>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm" :disabled="formLoading">确 定</el-button>
@@ -30,11 +41,12 @@
 
 <script>
 import * as DlInspectionProjectApi from '@/api/inspection/project';
-import {getRole} from "@/api/inspection/project";
+import {getGoods, getRole} from "@/api/inspection/project";
+import ElementBaseInfo from "@/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue";
 
 export default {
   name: "DlInspectionProjectForm",
-  components: {},
+  components: {ElementBaseInfo},
   data() {
     return {
       // 弹出层标题
@@ -59,12 +71,14 @@ export default {
         ]
       },
       roleList: [],
+      tableData: []
     };
   },
   methods: {
     /** 打开弹窗 */
     async open(id) {
       this.getRole()
+
       this.dialogVisible = true;
       this.reset();
       // 修改时，设置数据
@@ -73,10 +87,18 @@ export default {
         try {
           const res = await DlInspectionProjectApi.getDlInspectionProject(id);
           this.formData = res.data;
+          if (res.data.projectRoyaltyList.length > 0){
+            this.tableData = res.data.projectRoyaltyList
+            console.log('tableData', this.tableData)
+          }else {
+            this.getGoods()
+          }
           this.title = "修改检测项目";
         } finally {
           this.formLoading = false;
         }
+      }else {
+        this.getGoods()
       }
       this.title = "新增检测项目";
     },
@@ -87,14 +109,38 @@ export default {
       this.formLoading = true;
       try {
         const data = this.formData;
+
         // 修改的提交
         if (data.id) {
+          this.tableData.map(item => {
+            if (!item.royaltyAmount) {
+              item.royaltyAmount = 0
+            }else {
+              /*将royaltyAmount的单位转为分*/
+              item.royaltyAmount = item.royaltyAmount * 100
+            }
+          })
+          data.projectRoyaltyList = this.tableData
+          console.log('商品及提成', this.tableData)
           await DlInspectionProjectApi.updateDlInspectionProject(data);
           this.$modal.msgSuccess("修改成功");
           this.dialogVisible = false;
           this.$emit('success');
           return;
         }
+        this.tableData.map(item => {
+          item.goodsId = item.id
+          /*如果royaltyAmount 为空，则设置为0*/
+          if (!item.royaltyAmount) {
+            item.royaltyAmount = 0
+          }else {
+            /*将royaltyAmount的单位转为分*/
+            item.royaltyAmount = item.royaltyAmount * 100
+          }
+          delete item.id
+        })
+        data.projectRoyaltyList = this.tableData
+        console.log('商品及提成', this.tableData)
         // 添加的提交
         await DlInspectionProjectApi.createDlInspectionProject(data);
         this.$modal.msgSuccess("新增成功");
@@ -116,9 +162,13 @@ export default {
     /** 获取角色下拉框数据 */
     async getRole() {
       const res = await getRole();
-      console.log("角色的集合", res.data)
       this.roleList = res.data
     },
+    /** 获取角色下拉框数据 */
+    async getGoods() {
+      const res = await getGoods();
+      this.tableData = res.data.records
+    },
   }
 };
 </script>
diff --git a/src/views/inspection/project/index.vue b/src/views/inspection/project/index.vue
index 9f57085..98aec07 100644
--- a/src/views/inspection/project/index.vue
+++ b/src/views/inspection/project/index.vue
@@ -147,7 +147,8 @@ export default {
     /** 删除按钮操作 */
     async handleDelete(row) {
       const id = row.id;
-      await this.$modal.confirm('是否确认删除检测项目编号为"' + id + '"的数据项?')
+      const name = row.projectName;
+      await this.$modal.confirm('是否确认删除检测项目名称为"' + name + '"的数据项?')
       try {
         await DlInspectionProjectApi.deleteDlInspectionProject(id);
         await this.getList();
diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index a318aac..b5da3f5 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -110,9 +110,18 @@
     <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="车牌号" align="center" prop="carNum"/>
+      <el-table-column label="客户来源" align="center" prop="customerSource">
+      </el-table-column>
+      <el-table-column label="检测结果" align="center" prop="isPass">
+        <template slot-scope="scope">
+          <span v-if="scope.row.isPass =='0'">不合格</span>
+          <span v-else-if="scope.row.isPass =='1'">合格</span>
+          <span v-else>进行中</span>
+        </template>
+      </el-table-column>
       <el-table-column label="检测类型" align="center" prop="goodsTitle"/>
       <el-table-column label="检测项目" align="center" prop="skuName"/>
-      <el-table-column label="公示价格" align="center" prop="realPayMoney">
+      <el-table-column label="公示应收价格" align="center" prop="realPayMoney" width="100">
         <template slot-scope="scope">
           <span>{{ scope.row.goodsPrice / 100 }}</span>
         </template>
@@ -127,8 +136,6 @@
       <el-table-column label="客户手机号" align="center" prop="buyPhone"/>
       <!--      <el-table-column label="接待员" align="center" prop="workerName"/>-->
       <el-table-column label="接待员手机号" align="center" prop="workerPhone"/>
-      <el-table-column label="客户来源" align="center" prop="customerSource">
-      </el-table-column>
       <el-table-column label="支付方式" align="center" prop="payType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pay_type" :value="scope.row.payType"/>
@@ -136,13 +143,6 @@
       </el-table-column>
       <el-table-column label="开始时间" align="center" prop="startTime"/>
       <el-table-column label="结束时间" align="center" prop="endTime"/>
-      <el-table-column label="检测结果" align="center" prop="isPass">
-        <template slot-scope="scope">
-          <span v-if="scope.row.isPass =='0'">不合格</span>
-          <span v-else-if="scope.row.isPass =='1'">合格</span>
-          <span v-else>进行中</span>
-        </template>
-      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

From 83b8aa1b756cc97179629f816cc0b21898c32b4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Thu, 7 Nov 2024 18:05:00 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/partner/workOrder.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index b5da3f5..8f40bce 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -119,7 +119,7 @@
           <span v-else>进行中</span>
         </template>
       </el-table-column>
-      <el-table-column label="检测类型" align="center" prop="goodsTitle"/>
+      <el-table-column label="车辆类型" align="center" prop="goodsTitle"/>
       <el-table-column label="检测项目" align="center" prop="skuName"/>
       <el-table-column label="公示应收价格" align="center" prop="realPayMoney" width="100">
         <template slot-scope="scope">

From c44da68d9c534e243f049f23fd79662439a6a06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Fri, 8 Nov 2024 13:30:13 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=91=98=E5=B7=A5=E6=8F=90=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/inspection/cw/index.js           |  18 +
 src/views/inspection/cw/inspectionCw.vue | 414 +++++++++++++++++++++++
 src/views/partner/workOrder.vue          |   2 +-
 3 files changed, 433 insertions(+), 1 deletion(-)
 create mode 100644 src/api/inspection/cw/index.js
 create mode 100644 src/views/inspection/cw/inspectionCw.vue

diff --git a/src/api/inspection/cw/index.js b/src/api/inspection/cw/index.js
new file mode 100644
index 0000000..1576e70
--- /dev/null
+++ b/src/api/inspection/cw/index.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 分页查询节点提成
+export function getRoyaltyList(params) {
+  return request({
+    url: '/system/info/getRoyaltyList',
+    method: 'get',
+    params: params
+  })
+}
+// 分页查询节点提成总和
+export function getRoyaltySum(params) {
+  return request({
+    url: '/system/info/getRoyaltySum',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/views/inspection/cw/inspectionCw.vue b/src/views/inspection/cw/inspectionCw.vue
new file mode 100644
index 0000000..baf1e6f
--- /dev/null
+++ b/src/views/inspection/cw/inspectionCw.vue
@@ -0,0 +1,414 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="员工名称" prop="dealUserName">
+        <el-input
+          v-model="queryParams.dealUserName"
+          placeholder="请输入员工名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="月份" prop="rescueStartMonth">
+        <el-date-picker
+          v-model="queryParams.rescueStartMonth"
+          value-format="yyyy-MM"
+          type="month"
+          placeholder="选择月份"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="检测时间" prop="maintenanceTime">
+        <el-date-picker
+          v-model="time1"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          align="right"
+          unlink-panels
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :picker-options="pickerOptions"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          :loading="exportLoading"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+
+    <div style="display: flex;justify-content:right;font-weight: bold;font-size: 16px">
+<!--      <span>-->
+<!--         施救总金额：{{ moneyManagementData.allMoney }} 元-->
+<!--      </span>-->
+<!--      <span style="margin-left: 3%">-->
+<!--      出车次数：{{ moneyManagementData.allNum }} 次-->
+<!--      </span>-->
+<!--      <span style="margin-left: 3%">-->
+<!--      提成总金额：{{ moneyManagementData.tcAll }} 元-->
+<!--      </span>-->
+      <span style="margin-left: 3%">
+      提成总金额：{{ moneyManagementData.royaltyAmountSum }} 元
+      </span>
+    </div>
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+<!--      <el-table-column label="序号" align="center">-->
+<!--        <template scope="scope">-->
+<!--          <span>{{ scope.$index + 1 }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <el-table-column label="员工" align="center" prop="handlerName" />
+      <el-table-column label="提成" align="center" prop="royaltyAmount" />
+      <el-table-column label="项目完成时间" align="center" prop="node_create_time" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.node_create_time, '{y}-{m}-{d} {h}:{m}') }}</span>
+        </template>
+      </el-table-column>
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </div>
+</template>
+
+<script>
+import { moneyManagement, moneyManagementData, exportManagement } from '@/api/rescue/info'
+import { getmap } from '@/api/Map/map'
+import {getRoyaltyList, getRoyaltySum} from "@/api/inspection/cw";
+// import Map from '../../components/Map/index'
+
+export default {
+  name: 'Info',
+  dicts: ['dljy_type', 'fee_type', 'car_type', 'yes_no', 'jy_status', 'jy_order_status'],
+  data() {
+    return {
+      // 导出遮罩层
+      exportLoading: false,
+      pickerOptions: null,
+      chooseDriverId: '',
+      rescueInfoId: '',
+      // 遮罩层
+      loading: true,
+      ztlist: [],
+      // 选中数组
+      ids: [],
+      time1: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 道路救援模块表格数据
+      infoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      opens: false,
+      designateFlag: false,
+      zong: '',
+      repaymentForm: {},
+      repaymentOpen: false,
+      moneyManagementData: {},
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        connectionName: null,
+        isAppointment: null,
+        rescueType: null,
+        feeType: null,
+        carBrand: null,
+        destinationInfo: null,
+        rescueStatus: null,
+        rescueAmount: null,
+        rescueStart: null
+      },
+      // 表单参数
+      form: {},
+      driverList: [],
+      // 表单校验
+      rules: {
+        connectionName: [
+          { required: true, message: '联系人名称不能为空', trigger: 'blur' }
+        ],
+        connectionPhone: [
+          { required: true, message: '联系人手机号不能为空', trigger: 'blur' }
+        ],
+        licenseNum: [
+          { required: true, message: '车牌号不能为空', trigger: 'blur' }
+        ],
+        isAppointment: [
+          { required: true, message: '是否为预约单不能为空', trigger: 'change' }
+        ],
+        rescueType: [
+          { required: true, message: '救援类型 1拖车2送油3搭电4换台5扣车不能为空', trigger: 'change' }
+        ],
+        carType: [
+          { required: true, message: '车辆类型  大中小不能为空', trigger: 'change' }
+        ],
+        rescuePosition: [
+          { required: true, message: '救援地点 详细描述不能为空', trigger: 'blur' }
+        ],
+        feeType: [
+          { required: true, message: '收费类型不能为空', trigger: 'change' }
+        ]
+      }
+    }
+  },
+
+  components: {
+    Map
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    cancelRepayment() {
+      this.repaymentForm = {}
+      this.repaymentOpen = false
+    },
+    repaymentSubmit() {
+      this.$refs['repaymentForm'].validate(valid => {
+        if (valid) {
+          returnOrder(this.repaymentForm).then(res => {
+            this.$modal.msgSuccess('还款成功')
+            this.repaymentOpen = false
+            this.repaymentForm = {}
+            this.getList()
+          })
+        }
+      })
+    },
+    repayment(data) {
+      this.repaymentOpen = true
+      this.repaymentForm.rescueOrderId = data.rescueOrderId
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        if (rowIndex % 2 === 0) {
+          return {
+            rowspan: 2,
+            colspan: 1
+          }
+        } else {
+          return {
+            rowspan: 0,
+            colspan: 0
+          }
+        }
+      }
+    },
+    driverOk() {
+      this.designateFlag = false
+      designateDriver(this.rescueInfoId, this.chooseDriverId).then(res => {
+        this.$message.success('指派成功')
+        this.getList()
+      })
+    },
+    /** 查询道路救援模块列表 */
+    getList() {
+      this.loading = true
+      getRoyaltyList(this.queryParams).then(response => {
+        console.log("响应",response)
+        this.infoList = response.data.records
+        this.total = response.data.total
+        this.loading = false
+      })
+      getRoyaltySum(this.queryParams).then(response => {
+        this.moneyManagementData = response.data
+      })
+    },
+    getDriverList() {
+      getDriver().then(response => {
+        this.driverList = response.rows
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        connectionName: null,
+        connectionPhone: null,
+        licenseNum: null,
+        isAppointment: null,
+        rescueTime: null,
+        rescueType: null,
+        carType: null,
+        rescuePosition: null,
+        rescueLongitude: null,
+        rescueLatitude: null,
+        feeType: null,
+        carBrand: null,
+        destinationInfo: null,
+        destinationLongitude: null,
+        destinationLatitude: null,
+        rescueStatus: null,
+        driverId: null,
+        rescueAmount: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      }
+      this.resetForm('form')
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      if (this.time1 && this.time1.length > 0) {
+        this.queryParams.rescueStart = this.time1[0]
+        this.queryParams.rescueEnd = this.time1[1]
+      }
+      this.queryParams.pageNo = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.time1 = []
+      this.resetForm('queryForm')
+      this.queryParams = {}
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加道路救援模块'
+    },
+    pickDriver(row) {
+
+    },
+    designateDriver(row) {
+      this.designateFlag = true
+      this.rescueInfoId = row.id
+      this.getDriverList()
+
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改道路救援模块'
+      })
+    },
+    handleMap(row) {
+      this.rescueInfoId = row.id
+      routeInfo(row.id).then(res => {
+        this.ztlist = res.data
+        this.none(res.data)
+      })
+      getmap(row.id).then(res => {
+        let datas = []
+        res.data.forEach(it => {
+          let temp = [it.longitude, it.latitude]
+          datas.push(temp)
+        })
+        this.$refs.mapComponent.initMap(datas)
+      })
+      this.opens = true
+    },
+    none(arr) {
+      let sum = 0
+      for (var i = 0; i < arr.length; i++) {
+        sum += arr[i].distanceMeter
+      }
+
+      this.zong = sum
+    },
+
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addInfo(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除道路救援模块编号为"' + ids + '"的数据项？').then(function() {
+        return delInfo(ids)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    async handleExport() {
+      try {
+        this.exportLoading = true
+        this.queryParams.pageNo = 1
+        this.queryParams.pageSize = 500
+        this.$modal.msgError("系统故障，联系管理员")
+        // const data = await exportManagement(this.queryParams)
+        // this.$download.excel(data, `救援财务报表_${new Date().getTime()}.xlsx`)
+      } catch {
+      } finally {
+        this.exportLoading = false
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.lang-for {
+  width: 100%;
+  margin: 10px auto;
+}
+</style>
diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index 8f40bce..57f9b4b 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -97,7 +97,7 @@
       </el-col>
       <div style="margin-left: 72%;font-weight: bold">
       <span>
-         公示价格汇总：{{ moneyData.goodsPriceSum / 100 }} 元
+         公示应收价格汇总：{{ moneyData.goodsPriceSum / 100 }} 元
       </span>
         <span style="margin-left: 3%">
       实付金额汇总：{{ moneyData.payMoneySum / 100 }} 元

From a88664df4e07242b5052226a4185e46d35512d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Mon, 11 Nov 2024 16:43:31 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E9=A1=B9=E7=9B=AE=E6=8F=90=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/DlInspectionProjectForm.vue       |  30 +-
 src/views/partner/api/workOrder.js            |  17 ++
 src/views/partner/workOrder.vue               | 261 +++++++++++++++++-
 3 files changed, 282 insertions(+), 26 deletions(-)

diff --git a/src/views/inspection/project/DlInspectionProjectForm.vue b/src/views/inspection/project/DlInspectionProjectForm.vue
index c5d9433..322a111 100644
--- a/src/views/inspection/project/DlInspectionProjectForm.vue
+++ b/src/views/inspection/project/DlInspectionProjectForm.vue
@@ -90,8 +90,6 @@ export default {
           if (res.data.projectRoyaltyList.length > 0){
             this.tableData = res.data.projectRoyaltyList
             console.log('tableData', this.tableData)
-          }else {
-            this.getGoods()
           }
           this.title = "修改检测项目";
         } finally {
@@ -109,25 +107,6 @@ export default {
       this.formLoading = true;
       try {
         const data = this.formData;
-
-        // 修改的提交
-        if (data.id) {
-          this.tableData.map(item => {
-            if (!item.royaltyAmount) {
-              item.royaltyAmount = 0
-            }else {
-              /*将royaltyAmount的单位转为分*/
-              item.royaltyAmount = item.royaltyAmount * 100
-            }
-          })
-          data.projectRoyaltyList = this.tableData
-          console.log('商品及提成', this.tableData)
-          await DlInspectionProjectApi.updateDlInspectionProject(data);
-          this.$modal.msgSuccess("修改成功");
-          this.dialogVisible = false;
-          this.$emit('success');
-          return;
-        }
         this.tableData.map(item => {
           item.goodsId = item.id
           /*如果royaltyAmount 为空，则设置为0*/
@@ -140,6 +119,15 @@ export default {
           delete item.id
         })
         data.projectRoyaltyList = this.tableData
+        // 修改的提交
+        if (data.id) {
+          console.log('商品及提成', this.tableData)
+          await DlInspectionProjectApi.updateDlInspectionProject(data);
+          this.$modal.msgSuccess("修改成功");
+          this.dialogVisible = false;
+          this.$emit('success');
+          return;
+        }
         console.log('商品及提成', this.tableData)
         // 添加的提交
         await DlInspectionProjectApi.createDlInspectionProject(data);
diff --git a/src/views/partner/api/workOrder.js b/src/views/partner/api/workOrder.js
index 5963abc..5287e1d 100644
--- a/src/views/partner/api/workOrder.js
+++ b/src/views/partner/api/workOrder.js
@@ -143,3 +143,20 @@ export function detail(params) {
     params: params
   })
 }
+export function getINspectionProject(params) {
+  return request({
+    url: '/inspection/dl-inspection-project/page',
+    method: 'get',
+    params: {
+      pageNo:1,
+      pageSize:10000
+    }
+  })
+}
+export function getWeorkNodesById(params) {
+  return request({
+    url: '/system/info/getWeorkNodesById',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/views/partner/workOrder.vue b/src/views/partner/workOrder.vue
index 57f9b4b..0f7b483 100644
--- a/src/views/partner/workOrder.vue
+++ b/src/views/partner/workOrder.vue
@@ -367,6 +367,44 @@
             ></el-option>
           </el-select>
         </el-form-item>
+<!--        <el-form-item label="请选择检测项目">-->
+          <!-- 可选检测项目 -->
+        <div v-if="isInsert">
+        <div class="available-projects-title">可选检测项目：</div>
+        <div class="available-projects-container">
+          <div
+            class="project-button"
+            :class="{ 'selected' : selectInspectionProjectIds.includes(item.id) }"
+            v-for="item in projectList"
+            :key="item.id"
+            @click="clickProject(item)"
+          >
+            {{ item.projectName }}
+          </div>
+        </div>
+
+        <!-- 已选检测项目标题 -->
+        <div class="selected-projects-title">已选检测项目：</div>
+
+
+        <!-- 已选项目列表 -->
+        <div class="inspection-project-list">
+          <div class="project-item" v-for="(item, index) in selectInspectionProject" :key="index">
+            <div class="steps_">
+              <div class="index_2">{{ index + 1 }}</div>
+              <div class="project-name">{{ item.projectName }}</div>
+            </div>
+            <div class="arrow" v-if="index !== selectInspectionProject.length - 1">
+              <span>↓</span>
+            </div>
+          </div>
+        </div>
+        </div>
+
+
+        <!--        </el-form-item>-->
+
+
 
 
       </el-form>
@@ -380,9 +418,24 @@
 
 <script>
 import {
-  listWorkOrder, workOrderData, listGoods, addWorkInfo, getWorker, shopInfo, settleAccounts,
-  workOrderView, inspectionDetail, offlineCharging,
-  getBankAccountList, makeCertOk, stopInspection, updateWorkInfo, delWorkInfo, detail
+  listWorkOrder,
+  workOrderData,
+  listGoods,
+  addWorkInfo,
+  getWorker,
+  shopInfo,
+  settleAccounts,
+  workOrderView,
+  inspectionDetail,
+  offlineCharging,
+  getBankAccountList,
+  makeCertOk,
+  stopInspection,
+  updateWorkInfo,
+  delWorkInfo,
+  detail,
+  getINspectionProject,
+  getWeorkNodesById
 } from "./api/workOrder";
 import {getCustomerSource} from "./api/index";
 import print from 'vue-print-nb'
@@ -403,6 +456,7 @@ export default {
         payMoneySum: 0,
         goodsPriceSum: 0
       },
+      projectList:[],
       isPass: 1,
       isRetrial: '',
       remark: '',
@@ -459,6 +513,10 @@ export default {
       openhe: false,
       htmlStr: null,
       detailForm: [],
+      selectInspectionProject:[],
+      inspectionWorkNodeStr:[],
+      selectInspectionProjectIds:[],
+      isInsert: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -532,6 +590,19 @@ export default {
         this.getList()
       })
     },
+    clickProject(data) {
+      let idx = this.selectInspectionProjectIds.indexOf(data.id)
+      if (idx > -1) {
+        // 如果元素存在于数组中，则使用splice方法来删除它
+        this.selectInspectionProject.splice(idx, 1);
+        this.selectInspectionProjectIds.splice(idx, 1)
+      } else {
+        this.selectInspectionProject.push(data)
+        this.selectInspectionProjectIds.push(data.id)
+      }
+      console.log('已选择的检测项目', this.selectInspectionProject)
+
+    },
     jieshu(row) {
 
       this.inspectionId = row.id
@@ -540,6 +611,14 @@ export default {
         this.remark = "",
         this.openhe = true
     },
+    /*获取检测项目*/
+    getINspectionProject() {
+      this.selectInspectionProject = []
+      getINspectionProject().then(res => {
+        console.log('检测项目', res)
+        this.projectList = res.data.records
+      })
+    },
     zhizheng(row) {
       console.log(row)
       let data = {
@@ -704,6 +783,7 @@ export default {
         updateTime: null,
         updateBy: null,
       };
+      this.selectInspectionProject = []
       this.resetForm("form");
     },
 
@@ -727,6 +807,8 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getINspectionProject()
+      this.isInsert = true
       listGoods().then(res => {
         res.data.forEach(it => {
           let temp = {}
@@ -750,6 +832,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.isInsert = false
       this.reset();
       this.form = row
       let skuId = parseInt(row.skuId)
@@ -772,7 +855,6 @@ export default {
         })
         console.log(this.options)
       })
-
       this.addOpen = true;
       this.title = "工单";
     },
@@ -781,6 +863,18 @@ export default {
       if (this.form.id) {
         this.updateForm()
       } else {
+        if (this.selectInspectionProject.length == 0) {
+          this.$modal.msgError("请选择项目")
+        }
+        for (var i = 0; i < this.selectInspectionProject.length; i++) {
+          this.selectInspectionProject[i].orderNum = i+1
+          this.selectInspectionProject[i].projectId = this.selectInspectionProject[i].id
+          this.selectInspectionProject[i].id = undefined
+        }
+        console.log('项目', this.selectInspectionProject)
+        this.form.inspectionWorkNodes = this.selectInspectionProject
+        console.log('最终提交的项目', this.form)
+
         this.$refs["form"].validate(valid => {
           if (valid) {
             console.log(this.form.skuId[1])
@@ -795,6 +889,16 @@ export default {
       }
 
     },
+    getWeorkNodesById(id){
+      const params = {
+        inspectionId: id
+      }
+      getWeorkNodesById(params).then(res => {
+        console.log('根据工单id获取流程', res)
+        this.selectInspectionProject = res.data
+        this.selectInspectionProjectIds = this.selectInspectionProject.map(it => it.projectId)
+      })
+    },
     updateForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
@@ -872,7 +976,10 @@ export default {
   font-size: 22px;
   font-weight: bold;
 }
-* 对话框整体样式 */
+
+* 对话框整体样式 *
+
+/
 .custom-dialog {
   border-radius: 8px;
   box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
@@ -909,4 +1016,148 @@ export default {
   font-size: 14px;
   color: #666;
 }
+.title_ {
+  font-weight: bold;
+  margin-bottom: 10px;
+}
+
+.box_ {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.box_button {
+  padding: 10px;
+  margin: 5px;
+  background-color: #f0f0f0;
+  cursor: pointer;
+  border: 1px solid #ccc;
+}
+
+.box_button_x {
+  background-color: #cce5ff;
+  border-color: #007bff;
+}
+
+.steps_ {
+  display: flex;
+  align-items: center;
+}
+
+.index_ {
+  margin-right: 10px;
+  font-size: 16px;
+  font-weight: bold;
+}
+
+.xb_ {
+  text-align: center;
+  font-size: 16px;
+}
+.steps_ {
+  display: flex;
+  align-items: center;
+}.inspection-project-list {
+   display: flex;
+   flex-direction: column;
+   gap: 10px;
+   padding: 20px;
+   background-color: #f9f9f9;
+   border-radius: 10px;
+   box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
+ }
+
+.project-item {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 10px 15px;
+  background-color: #fff;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+  transition: background-color 0.3s ease;
+}
+
+.project-item:hover {
+  background-color: #f1f1f1;
+}
+
+.steps_ {
+  display: flex;
+  align-items: center;
+}
+
+.index_2 {
+  font-size: 18px;
+  font-weight: bold;
+  margin-right: 10px;
+  color: #007BFF;
+}
+
+.project-name {
+  font-size: 16px;
+  color: #333;
+  text-transform: capitalize;
+}
+
+.arrow {
+  font-size: 18px;
+  color: #007BFF;
+  font-weight: bold;
+}
+
+/* 可选检测项目标题 */
+.available-projects-title, .selected-projects-title {
+  font-size: 20px;
+  font-weight: bold;
+  color: #333;
+  margin-bottom: 10px;
+  padding-left: 20px;
+  border-left: 5px solid #007BFF;
+  padding-bottom: 5px;
+}
+
+/* 可选检测项目容器 */
+.available-projects-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+  margin-bottom: 20px;
+}
+
+/* 每个按钮的样式 */
+.project-button {
+  padding: 10px 15px;
+  background-color: #f0f0f0;
+  border-radius: 5px;
+  font-size: 16px;
+  color: #333;
+  cursor: pointer;
+  transition: background-color 0.3s ease, transform 0.2s ease;
+  display: inline-block;
+  white-space: nowrap;
+}
+
+.project-button:hover {
+  background-color: #007BFF;
+  color: white;
+  transform: scale(1.05);
+}
+
+/* 被选中的按钮样式 */
+.project-button.selected {
+  background-color: #007BFF;
+  color: white;
+  font-weight: bold;
+  border: 2px solid #0056b3;
+}
+
+/* 可选检测项目容器的按钮排列 */
+.available-projects-container {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 12px;
+}
+
+
 </style>