Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/ProductMag/index.vue

@@ -134,6 +134,7 @@ export default {
           "isonsale": val.isonsale//0：下架，1：上架
         },
       })
+      if(res.data == '失败') val.isonsale = 0
       this.tool.showMessage(res,()=>{
         this.$refs.basicLayout.listData()
       })

src/HDrpManagement/dispatch/details/index.vue

@@ -33,6 +33,7 @@
   <script>
   import productList from '../modules/productlist.vue'
   import defaultInfo from '../modules/defaultInfo.vue'
+import { log } from '@antv/g2plot/lib/utils'
   export default {
     name: "detail",
     data() {
@@ -55,18 +56,47 @@
           }
         })
         this.mainData = res.data
+        console.log(this.mainData)
         this.changeDataStructure()
       },
       changeDataStructure() {
         this.mainAreaData = [
           {
-            label:'关联订单',
+            label:'发货单号',
+            value:this.mainData.billno
+          },
+          {
+            label:'订单号',
             value:this.mainData.sonum
           },
+          {
+            label:'发货日期',
+            value:this.mainData.billdate
+          },
+          {
+            label:'品牌',
+            value:this.mainData.brandname
+          },
+          {
+            label:'经销商编号',
+            value:this.mainData.agentnum
+          },
+          {
+            label:'经销商名称',
+            value:this.mainData.enterprisename
+          },
           {
             label:'状态',
             value:this.mainData.STATUS
-          }
+          },
+          {
+            label:'运费状态',
+            value:this.mainData.freightstatus
+          },
+          {
+            label:'备注',
+            value:this.mainData.remarks
+          },
         ]
       },
       // 监听切换数据,上一页,下一页

src/HDrpManagement/dispatch/modules/defaultInfo.vue

@@ -1,18 +1,29 @@
 <template>
   <div>
+    <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
+      <div slot="title" class="my-label__title">收货单信息</div>
+      <el-descriptions-item label="发货单号">{{ mainData.billno?mainData.billno:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="订单号">{{ mainData.sonum?mainData.sonum:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="发货日期">{{ mainData.billdate?mainData.billdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="品牌">{{ mainData.brandname?mainData.brandname:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="经销商编号">{{ mainData.agentnum?mainData.agentnum:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="经销商名称">{{ mainData.enterprisename?mainData.enterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="状态">{{ mainData.STATUS?mainData.STATUS:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="备注">{{ mainData.remarks?mainData.remarks:"--" }}</el-descriptions-item>
+    </el-descriptions>
     <el-descriptions class="normal-margin" :column="2"  border labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">收货信息</div>
-      <el-descriptions-item label="企业名称">{{ mainData.recvice?mainData.recvice.enterprisename:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="联系人">{{ mainData.recvice?mainData.recvice.name:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="联系电话">{{ mainData.recvice?mainData.recvice.phonenumber:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="地址">{{ mainData.recvice?`${mainData.recvice.province}${mainData.recvice.city}${mainData.recvice.county}${mainData.recvice.address}`:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="联系人">{{ mainData.logiscompenterprisename?mainData.logiscompenterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="联系人电话">{{ mainData.logiscompphonenumber?mainData.logiscompphonenumber:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="省市县">{{ `${mainData.province}-${mainData.city}-${mainData.county}` }}</el-descriptions-item>
+      <el-descriptions-item label="地址">{{ mainData.address?mainData.address:"--" }}</el-descriptions-item>
     </el-descriptions>
-    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
-      <div slot="title" class="my-label__title">物流信息</div>
+    <!-- <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content"> -->
+      <!-- <div slot="title" class="my-label__title">物流信息</div> -->
       
-      <el-descriptions-item label="物流公司">{{ mainData.logiscomp?mainData.logiscomp.enterprisename:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="快递100ID">{{ mainData.logiscomp?mainData.logiscomp.kd100id:"--" }}</el-descriptions-item>
-    </el-descriptions>
+      <!-- <el-descriptions-item label="物流公司">{{ mainData.logiscomp?mainData.logiscomp.enterprisename:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="快递100ID">{{ mainData.logiscomp?mainData.logiscomp.kd100id:"--" }}</el-descriptions-item> -->
+    <!-- </el-descriptions> -->
   </div>
 </template>
 

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -13,35 +13,58 @@
         width="55"
         align="center">
       </el-table-column> -->
+      <el-table-column
+        prop="rowindex"
+        label="行号">
+      </el-table-column>
+        <el-table-column
+        prop="billno"
+        label="订单号">
+      </el-table-column>
+      <el-table-column
+        prop="itemno"
+        label="产品编码">
+      </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称">
       </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="品号">
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="单位">
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="单价">
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="发货数量">
+      </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编号">
+        label="发货金额">
       </el-table-column>
       <el-table-column
-        label="型号/规格">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
-        </template>
+        prop="itemname"
+        label="未发货数量">
       </el-table-column>
       <el-table-column
-        label="数量">
-        <template slot-scope="scope">
-          <!-- <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="1" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number> -->
-          <span>{{scope.row.qty}}</span>
-        </template>
+        prop="itemname"
+        label="备注">
       </el-table-column>
       <el-table-column
-        prop="unit"
-        label="计量单位"
-        width="90">
-        <template slot-scope="scope">
-          <el-tag size="mini" type="info" effect="plain">{{scope.row.unitname}}</el-tag>
-          
-        </template>
+        prop="itemname"
+        label="erp即时库存">
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        width="120px"
+        label="drp可发货数量">
       </el-table-column>
       <el-table-column v-if="type === 'edit'" width="90" fixed="right">
         <template slot-scope="scope">
@@ -93,6 +116,8 @@ export default {
       this.tableData = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(res.data);
+      
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);

src/HDrpManagement/orderManage/index.vue

@@ -10,8 +10,72 @@
       :options="options"
       :detailPath="{
         path:'/orderdetail'
-      }">
-      <div slot="custom"></div>
+      }"
+      @listData="list">
+      <template #custom>
+        <div class="label_center mt-10">
+          <p class="search__label">状态:</p>
+          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="新建" value="新建"></el-option>
+            <el-option label="提交" value="提交"></el-option>
+            <el-option label="交期待确认" value="交期待确认"></el-option>
+            <el-option label="交期确认" value="交期确认"></el-option>
+            <el-option label="审核" value="审核"></el-option>
+            <el-option label="关闭" value="关闭"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center mt-10">
+          <p class="search__label">订单类型:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="标准订单" value="标准订单"></el-option>
+            <el-option label="特殊订单" value="特殊订单"></el-option>
+            <el-option label="项目订单" value="项目订单"></el-option>
+            <el-option label="促销订单" value="促销订单"></el-option>
+            <el-option label="工具订单" value="工具订单"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center mt-10">
+          <p class="search__label">领域:</p>
+          <el-select v-model="tradefield" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option
+              v-for="(item,index) in tradefieldList"
+              :key="index"
+              :label="item.value"
+              :value="item.value"
+            />
+          </el-select>
+        </div>
+        <div class="label_center mt-10">
+          <p class="search__label">核销状态:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择核销状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="已核销" value="已核销"></el-option>
+            <el-option label="部分核销" value="部分核销"></el-option>
+            <el-option label="未核销" value="未核销"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center mt-10">
+          <p class="search__label">开票状态:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="已开票" value="已开票"></el-option>
+            <el-option label="部分开票" value="部分开票"></el-option>
+            <el-option label="未开票" value="未开票"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <p class="search__label">是否退货:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择退货状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <p class="search__label">是否变更:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择变更状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option label="未变更" value="未变更"></el-option>
+            <el-option label="已变更" value="已变更"></el-option>
+          </el-select>
+        </div>
+      </template>
       <template v-slot:tbList="scope">
         <div>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -24,25 +88,43 @@
 </template>
 
 <script>
-/**
- * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
- * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
- * @param {string} tableName 开发端配置的表格名称
- * @param {String} idName 数据主id名称
- * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
- * @param {Array} options:{label:描述,value:值} 
- */
+
 export default {
   data () {
     return {
-      options:[]
+      options:[],
+      tradefieldList:'',
+      status:'',
+      type:'',
+      tradefield:'',
+      hexiaostatus:'',
+      kaipiaostatus:'',
+      isback:'',
+      ischange:''
       
     }
   },
   methods:{
+    list (data) {
+      console.log(data);
+      
+    },
+    /* 领域 */
+    async getTradefield () {
+      const res = await this.$store.dispatch('optiontypeselect','tradefield')
+      this.tradefieldList = res.data
+      console.log(this.tradefieldList,'领域');
+    },
+  },
+  created () {
+    this.getTradefield()
   }
 }
 
 </script>
-<style>
+<style scoped>
+.box > div {
+  margin-bottom:10px;
+  display: inline-block;
+}
 </style>

src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -134,7 +134,6 @@ export default {
         let content = this.priceArr.map((item,index) => {
           if (this.form[item] !== 0) {
             return {
-              "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
               "pricegrade":index + 1,
               "price":this.form[item]
             }
@@ -144,6 +143,8 @@ export default {
             "id": "20221025165904",
             "content": {
                 "sa_itempriceadjustid": this.$route.query.id,
+                "marketprice":this.data.marketprice,
+                "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
                 "sa_itempriceadjust_itemprice": content
             }
         })

src/HDrpManagement/serveBill/modules/detail.vue

@@ -19,6 +19,7 @@
       </div>
       <div slot="customOperation" >
         <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" :data="mainData" @onSuccess="queryMainData" />
+        <changeBill v-if="mainData.status == '提交' && tool.checkAuth($route.name,'changeBill')" class="inline-16" @onSuccess="queryMainData" :data="mainData"></changeBill>
         <customBtn 
           btnName="提交"
           message="确认提交当前服务申请单吗?"
@@ -109,10 +110,39 @@ export default {
       this.changeDataStructure()
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
         {label:'单号',value:this.mainData.billno ? this.mainData.billno : ''},
         {label:'单据日期',value:this.mainData.billdate ? this.mainData.billno : ''},
-        {label:'状态',value:this.mainData.status ? this.mainData.status : ''},
+        {label:'状态',value:this.mainData.status ? this.mainData.status : '',
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '进行中':
+                style = {color:'#52c41a'}
+                break;
+              case '待处理':
+                style = {color:'#3874f6'}
+                break;
+              case '新建':
+                style = {color:'#333333'}
+                break;
+              case '提交':
+                style = {color:'#3874f6'}
+                break; 
+              case '待指派':
+                style = {color:'#fa8c16'}
+                break; 
+              case '已完成':
+                style = {color:'#fa8c16'}
+                break; 
+              default:
+                break;
+            }
+            return style
+            
+          }  
+        },
         {label:'经销商编号',value:this.mainData.agentnum ? this.mainData.agentnum : ''},
         {label:'经销商',value:this.mainData.enterprise ? this.mainData.enterprise : ''},
         {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},

src/HDrpManagement/serveWorkBill/components/add.vue

@@ -1,90 +0,0 @@
-<template>
-  <div>
-    <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible" width="500px">
-      <div slot="title" style="font-size: 15px">
-        新增账户类型
-      </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="20">
-            <el-form-item label="账户编号" prop="accountno">
-              <el-input v-model="form.accountno" placeholder="账户编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="账户名称" prop="accountname">
-              <el-input v-model="form.accountname" placeholder="账户名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" checked="checked">允许订货</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" checked="checked">是否启用</el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "add",
-  data(){
-    return {
-      dialogFormVisible:false,
-      isordercheck:true,
-      isusedcheck:false,
-      form:{
-        sa_accountclassid:0,
-        accountno:'',
-        accountname:'',
-        isorder:'',
-        isused:0
-      },
-      rules:{
-        accountno:[
-          { required: true, message: '输入账户编号', trigger: 'blur'},
-        ],
-        accountname:[
-          { required: true, message: '输入账户名称', trigger: 'blur'}
-        ]
-      }
-    }
-  },
-  methods:{
-    onSubmit(){
-      console.log(this.form)
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": "20221008134703",
-          "version":1,
-          "content": this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$emit('onSuccess')
-          this.$refs['form'].resetFields();
-          this.dialogFormVisible = false
-        })
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.dialog-footer {
-  margin-top: 0;
-}
-</style>

src/HDrpManagement/serveWorkBill/components/edit.vue

@@ -1,93 +1,231 @@
 <template>
   <div>
-    <el-button  size="mini" :type="btnType?btnType:'text'" @click="onShow">编 辑</el-button>
-    <el-dialog title="编 辑" :visible.sync="dialogFormVisible" width="500px" append-to-body>
+    <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
+    <el-drawer title="新 建" append-to-body :show-close="false" :visible.sync="dialogFormVisible" size="40%">
       <div slot="title" style="font-size: 15px">
-        修改账户类型
+        编辑服务工单
       </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="20">
-            <el-form-item label="账户编号" prop="accountno">
-              <el-input v-show="form.isused !== 1" v-model="form.accountno" placeholder="账户编号"></el-input>
-              <span v-show="form.isused === 1">{{form.accountno}}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item label="账户名称" prop="accountname">
-              <el-input v-show="form.isused !== 1" v-model="form.accountname" placeholder="账户名称"></el-input>
-              <span v-show="form.isused === 1">{{form.accountname}}</span>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" >允许订货</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="10">
-            <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" >是否启用</el-checkbox>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
-      <div class="dialog-footer">
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="140px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="申请单:" prop="billno">
+                <selectOrder ref="order" @selectRow="orderChange">
+                    <el-input readonly type="text" slot="input" size="mini" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.billno"></el-input>
+                </selectOrder>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="工单模板:" prop="templatename">
+                <selectTemplate ref="template" @selectRow="templateChange">
+                    <el-input readonly type="text" slot="input" size="mini" @focus="$refs.template.listData(),$refs.template.visible=true" v-model="form.templatename"></el-input>
+                </selectTemplate>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="是否在保" prop="inqualityguaranteeperiod">
+                <el-radio-group v-model="form.inqualityguaranteeperiod">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="是否在我司产品" prop="isouritem">
+                <el-radio-group v-model="form.isouritem">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="异常属实" prop="isfact">
+                <el-radio-group v-model="form.isfact">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人" prop="scenecontact">
+                <el-input v-model="form.scenecontact" placeholder="请输入联系人"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人角色" prop="scenecontactrole">
+                <el-input v-model="form.scenecontactrole" placeholder="请输入联系人角色"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="联系人电话" prop="scenecontactphonenumber">
+                <el-input v-model="form.scenecontactphonenumber" placeholder="请输入联系人电话"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="服务团队" prop="servicetype">
+                <selectTeam ref="team" @teamChange="teamChange">
+                  <el-tag
+                    style="margin-bottom:10px"
+                    :key="tag.userid"
+                    v-for="tag in form.projectlearders"
+                    closable
+                    :disable-transitions="false"
+                    @close="handleClose(tag)">
+                    {{tag.name}}
+                  </el-tag>
+                  <el-button class="button-new-tag" size="small" @click="$refs.team.dialogFormVisible=true">+ New people</el-button>
+                </selectTeam>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remarks">
+                <el-input type="textarea" v-model="form.remarks" placeholder="请输入备注"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import selectOrder from './selectOrder'
+import selectTemplate from './selectTemplate'
+
+import selectTeam from './teamSelect'
+import { log } from '@antv/g2plot/lib/utils'
 export default {
-  name: "edit",
-  props:['data','btnType'],
+  name: "add",
+  props:['data'],
+  components:{selectOrder,selectTemplate,selectTeam},
   data(){
     return {
       dialogFormVisible:false,
+      serveClassList:[],
       form:{
-        "sa_accountclassid":'',
-        "accountno":"",
-        "accountname":"",
-        "isorder":'',
-        "isused":''
+        "sa_workorderid":'',     //sa_brandid<=0时 为新增
+        "sa_serviceorderid":'',
+        "billno":'',
+        "sa_workorder_templateid":'',
+        "templatename":'',
+        "name":'',
+        "remarks":"",
+        "inqualityguaranteeperiod":1,
+        "isouritem":1,
+        "isfact":1,
+        "reason":"",
+        "address":"",
+        "scenecontact":"",
+        "scenecontactrole":"",
+        "scenecontactphonenumber":"",
+        "projectlearders":[]
       },
       rules:{
-        accountno:[
-          { required: true, message: '输入账户编号', trigger: 'blur'},
+        billno:[
+          { required: true, message: '请选择申请单', trigger: 'change'},
+        ],
+        templatename:[
+          { required: true, message: '请选择模板', trigger: 'change'}
         ],
-        accountname:[
-          { required: true, message: '输入账户名称', trigger: 'blur'}
-        ]
-      }
+        scenecontactphonenumber:[
+          { pattern:/^1[3-9][0-9]\d{8}$/, message: '请输入正确手机号码',trigger: 'blur' }
+        ],
+      },
     }
   },
   methods:{
-    onShow(){
+    editBtn () {
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
-      console.log(this.form)
+      this.form.projectlearders = this.form.team
+      console.log(this.form);
+      
     },
     onSubmit(){
       console.log(this.form)
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+        this.form.projectlearders = this.form.projectlearders.map(item => item.userid)
         const res = await this.$api.requested({
-          "id": "20221008134703",
+          "id": "20230208140003",
           "version":1,
           "content": this.form
         })
         this.tool.showMessage(res,()=>{
           this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
           this.dialogFormVisible = false
         })
       })
+    },
+    async getTeamList () {
+      let res = await this.$api.requested({
+        "id":20230206112003,
+        "content": {
+        }
+      })
+      this.serveClassList = res.data
+      console.log(this.serveClassList);
+      
+    },
+    orderChange (data) {
+      console.log(data);
+      
+      this.form.billno = data.billno
+      this.form.sa_serviceorderid = data.sa_serviceorderid
+      this.$refs.order.visible = false
+    },
+    templateChange (data) {
+      console.log(data);
+      
+      this.form.name = data.name
+      this.form.sa_workorder_templateid = data.sa_workorder_templateid
+      this.$refs.template.visible = false
+    },
+    handleClose(tag) {
+      this.form.projectlearders.splice(this.form.projectlearders.indexOf(tag), 1);
+    },
+    teamChange (data) {
+      let result = data.map(item => {
+        return {
+          name:item.name,
+          userid:item.userid
+        }
+      })
+      this.form.projectlearders.push(...result)
+      this.$refs.team.dialogFormVisible = false
     }
+  },
+  created () {
   }
 }
 </script>
 
 <style scoped>
-
+.dialog-footer {
+  margin-top: 0;
+}
+.el-select,.el-input,.el-cascader {
+  width: 100% !important;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+}
+.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+  vertical-align: bottom;
+}
 </style>

src/HDrpManagement/serveWorkBill/components/selectOrder.vue

@@ -0,0 +1,108 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          border>
+          <el-table-column
+            prop="billno"
+            label="单号">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            label="经销商编号">
+          </el-table-column>
+          <el-table-column
+            prop="enterprisename"
+            label="经销商">
+          </el-table-column>
+          <el-table-column
+            prop="reason"
+            label="申请原因">
+          </el-table-column>
+          <el-table-column
+            prop="billdate"
+            label="提交日期">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="90">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id": 20230206091703,
+        "version":1,
+        "content": {
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/serveWorkBill/components/selectTemplate.vue

@@ -0,0 +1,103 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          border>
+          <el-table-column
+            prop="name"
+            label="模板名称">
+          </el-table-column>
+          <el-table-column
+            prop="type"
+            label="模板类型">
+          </el-table-column>
+          <el-table-column
+            prop="isused"
+            label="是否启用">
+            <template slot-scope="scope">
+                <span>{{scope.row.isused ? '是' : '否'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="90">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id": 20230207140603,
+        "version":1,
+        "content": {
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/serveWorkBill/components/teamSelect.vue

@@ -0,0 +1,102 @@
+<template>
+  <div>
+    <slot></slot>
+    <el-drawer append-to-body :show-close="false" :visible.sync="dialogFormVisible" size="60%">
+      <div slot="title" style="font-size: 15px">
+        选择团队人员
+      </div>
+      <div class="drawer__panel">
+        <el-input style="width:250px;margin-bottom:10px" size="small" placeholder="请输入搜索内容" clearable @clear="getOrderList(params.content.pageNumber=1)" v-model="params.content.where.condition" @keyup.enter.native="getOrderList(params.content.pageNumber=1)"></el-input>
+        <selectTable @selectChange="selectChange" v-if="dialogFormVisible" idName="userid" ref="table" v-model="result" :layout="tablecols" :data="teamList" :custom="true" height="500px"  @upDateData="upDateData">
+           <template v-slot:customcol="scope">
+              <div>{{scope.column.data[scope.column.columnname]}}</div>
+            </template>
+        </selectTable>
+        <div class="container normal-panel" style="text-align:right">
+          <el-pagination
+              style="text-align:right"
+              background
+              small
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page="params.content.pageNumber"
+              :page-size="params.content.pageSize"
+              layout="total, prev, pager, next, jumper"
+              :total="total">
+          </el-pagination>
+        </div>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" :disabled="selectArr.length <=0" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import selectTable from '@/components/selectTable/index'
+export default {
+  props:[],
+  components:{selectTable},
+  data(){
+    return {
+      dialogFormVisible:false,
+      tablecols:[],
+      teamList:[],
+      total:0,
+      params: {
+        "id": 20221102090303,
+        "content": {
+          containssub:true,
+          departmentids:[1],
+            where: {
+              isworker:0
+            }
+        }
+      },
+      result:'',
+      selectArr:[]
+    }
+  },
+  methods:{
+    onSubmit () {
+      if(this.selectArr.length <= 0) return
+      this.$emit('teamChange',this.selectArr)
+    },
+    async getOrderList () {
+      let res = await this.$api.requested(this.params)
+      console.log(res.data);
+      
+      this.teamList = res.data
+      this.total = res.total
+      console.log(res);
+    },
+    selectChange (data) {
+      this.selectArr = data
+      console.log(this.selectArr);
+
+    },
+    upDateData (data) {
+      this.selectArr = data
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.getOrderList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.getOrderList()
+    },
+  },
+  created () {
+    this.getOrderList()
+    this.tablecols = this.tool.tabelCol(this.$route.name).staffTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+</style>

src/HDrpManagement/serveWorkBill/index.vue

@@ -2,21 +2,60 @@
 <template>
   <div>
     <basicLayout 
-      ref="basicLayout" 
+      ref="list" 
       :oldFormPath="{
-        add:'HManagement/accountManage/modules'
+        add:'HDrpManagement/serveWorkBill/components'
       }"
-      tableName="accountTable" 
-      idName="userid" 
-      :apiId="{query:20221031141102,del:20221031141202}"
+      tableName="indexTable" 
+      idName="sa_workorderid" 
+      :apiId="{query:20230208140203,del:20230209144803}"
       :options="options"
       :detailPath="{
-        path:'/account_details'
-      }">
-      <div slot="custom"></div>
+        path:'/workorderDetail'
+      }"
+      @listData="list"
+      @listCreate="listCreate">
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <label  class="search__label">状态:</label>
+          <el-select class="inline-24" v-model="where.status" placeholder="请选择状态" @change="selectChange" size="small" clearable>
+            <el-option label="待指派" value="待指派"></el-option>
+            <el-option label="待处理" value="待处理"></el-option>
+            <el-option label="进行中" value="进行中"></el-option>
+            <el-option label="已完成" value="已完成"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <label class="search__label" >提交日期:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="dateChange"
+              value-format="yyyy-MM-dd"
+              v-model="where.date"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
-        <div>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span style="color:#52c41a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '进行中'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待处理'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#333333" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#3874f6" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '待指派'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已完成'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+          <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+        </div>
+        <div v-else-if="scope.data.column.columnname == 'province'">
+          {{ `${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}` }}
+        </div>
+        <div v-else>
+          {{scope.data.column.data[[scope.data.column.columnname]]?scope.data.column.data[[scope.data.column.columnname]]:'--'}}
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
@@ -26,14 +65,41 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   data () {
     return {
-      options:[]
+      options:[],
+      where: {
+        status:'',
+        date: ''
+      }
       
     }
   },
   methods:{
+    list (data) {
+      console.log(data);
+      
+    },
+    listCreate (param) {
+      param.content.isadmin = true
+    },
+    selectChange () {
+      this.$refs.list.param.content.where = this.where
+      this.$refs.list.listData()
+    },
+    dateChange (date) {
+      if (date) {
+        this.where.startdate = date[0]
+        this.where.enddate = date[1]
+      } else {
+        this.where.startdate = ''
+        this.where.enddate = ''
+      }     
+      this.$refs.list.param.content.where = this.where
+      this.$refs.list.listData()
+    }
   }
 }
 

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -2,92 +2,306 @@
   <div>
     <basicDetails
         ref="details"
-        :titleText="`${mainData.accountno}-${mainData.name}`"
-        :oldFormPath="{edit:'/HDrpManagement/serveBill/components'}"
+        :titleText="mainData.billno"
+        :oldFormPath="{edit:'HDrpManagement/serveWorkBill/components'}"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         turnPageId="20221031141102"
-        idname="userid"
-        ownertable="sys_users"
+        idname="sa_workorderid"
+        ownertable="sa_workorder"
         tags=""
-        :tabs="['员工信息','角色信息']"
+        :tabs="['工序详情','详细信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
       </div>
       <div slot="customOperation" >
+        <customBtn 
+          btnName="接单"
+          message="确认接单当前服务工单吗?"
+          idName="20230210101103"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status == '新建'"
+        />
+        <customBtn 
+          btnName="开始"
+          message="确认开始当前服务工单吗?"
+          idName="20230209144503"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status == '待开始'"
+
+        />
+        <customBtn 
+          btnName="暂停"
+          message="确认暂停当前服务工单吗?"
+          idName="20230209144603"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status == '进行中'"
+
+        />
+        <customBtn 
+          btnName="启用"
+          message="确认启用当前服务工单吗?"
+          idName="20230209144703"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status == '暂停中'"
+
+        />
+        <customBtn 
+          btnName="完结"
+          message="确认完结当前服务工单吗?"
+          idName="20230209144903"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status != '新建'"
+
+        />
+        <customBtn 
+          btnName="作废"
+          message="确认作废当前服务工单吗?"
+          idName="20230209144803"
+          keyName="sa_workorderid"
+          :id="$route.query.id"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          v-if="mainData.status == '新建'"
+        />
       </div>
       <div slot="slot0" >
+        <taskDetail :data="nodes">
+          <template v-slot:detail="scope">
+              <taskListDetail class="inline-16" :data="scope.data"></taskListDetail>
+          </template>
+          <!-- <template v-slot:edit="scope">
+            <taskListEdit class="inline-16" :data="scope.data"/>
+          </template> -->
+        </taskDetail>
       </div>
       <div slot="slot1" >
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
+        
       </div>
     </basicDetails>
   </div>
 </template>
 
 <script>
+import detailInfo from '@/components/detailInfo/index'
+import taskDetail from './taskDetail/index'
+import taskListDetail from './taskDetail/taskListDetail'
+import taskListEdit from './taskDetail/taskListEdit'
 export default {
   name: "detail",
   data() {
     return {
-      mainData:{},
-      mainAreaData:{}
+      mainData:'',
+      mainAreaData:{},
+      detailInfo:'',
+      nodes:[]
     }
   },
   components:{
+    detailInfo,
+    taskDetail,
+    taskListDetail,
+    taskListEdit
   },
   methods:{
     async queryMainData(id) {
       const res = await this.$api.requested({
-        "classname": "webmanage.users.users",
-        "method": "query_userMain",
+        "id":20230208140103,
         "content": {
-          "userid": this.$route.query.id
+          "sa_workorderid": this.$route.query.id
         }
       })
+      console.log(res.data,'111');
+      
       this.mainData = res.data
+      this.changeDataStructure()
+      console.log(res.data.nodes);
+      
+      this.nodes = this.createTreeData(res.data.nodes)
+      console.log(this.mainData);
+            
     },
     changeDataStructure() {
+      let that = this
       this.mainAreaData = [
         {
-          label:'账号类型',
-          value:this.mainData.usertypename
+          label:'单号',
+          value:this.mainData.billno
+        },
+        {
+          label:'服务申请单号',
+          value:this.mainData.servicebillno
+        },
+        {
+          label:'工单类型',
+          value:this.mainData.type
         },
         {
           label:'状态',
-          value:this.minaInfo.status === 'ACTIVE'?'启用':this.minaInfo.status === 'INACTIVE'?'停用':'其他'
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '进行中':
+                style = {color:'#52c41a'}
+                break;
+              case '待处理':
+                style = {color:'#3874f6'}
+                break;
+              case '新建':
+                style = {color:'#333333'}
+                break;
+              case '提交':
+                style = {color:'#3874f6'}
+                break; 
+              case '待指派':
+                style = {color:'#fa8c16'}
+                break; 
+              case '已完成':
+                style = {color:'#fa8c16'}
+                break; 
+              default:
+                break;
+            }
+            return style
+            
+          }
         },
         {
-          label:'联系方式',
-          value:this.mainData.phonenumber
+          label:'经销商编号',
+          value:this.mainData.agentnum
         },
         {
-          label:'上级企业',
-          value:this.mainData.superiorenterprisename
+          label:'经销商',
+          value:this.mainData.enterprisename
         },
         {
-          label:'成交状态',
-          value:this.mainData.tradingstatus
+          label:'省市县',
+          value:this.mainData.province
         },
         {
-          label:'负责人',
-          value:this.mainData.leader[0]?this.mainData.leader[0].name:""
+          label:'地址',
+          value:this.mainData.address
         },
         {
-          label:'最近跟近时间',
-          value:''
+          label:'创建时间',
+          value:this.mainData.createdate
         },
         {
-          label:'所属公海',
-          value:this.mainData.poolname
+          label:'结束时间',
+          value:this.mainData.enddate
         }
       ]
+      this.detailInfo = [
+        {
+          title:'基本信息',
+          info: [
+            {label:'单号',value:this.mainData.billno},
+            {label:'申请单号',value:this.mainData.servicebillno},
+            {label:'状态',value:this.mainData.status},
+            {label:'经销商编号',value:this.mainData.agentnum},
+            {label:'经销商',value:this.mainData.enterprise},
+            {label:'业务员',value:this.mainData.scenecontact},
+            {label:'业务员电话',value:this.mainData.scenecontactphonenumber},
+            {label:'工单负责人',value:this.mainData.scenecontact},
+            {label:'工单类型',value:this.mainData.type},
+            {label:'工单模板',value:this.mainData.name},
+            {label:'省市县',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
+            {label:'地址',value:this.mainData.address},
+            {label:'创建人',value:this.mainData.createby},
+            {label:'创建时间',value:this.mainData.createdate},
+          ]
+        },
+        {
+          title:'工单物料',
+          info: [
+            {label:'编码',value:this.mainData.billno},
+            {label:'名称',value:this.mainData.billdate},
+            {label:'型号',value:this.mainData.status},
+            {label:'规格',value:this.mainData.agentnum},
+            {label:'数量',value:this.mainData.enterprise},
+          ]
+        },
+        {
+          title:'确认单',
+          info: [
+            {label:'确认单号',value:this.mainData.billno},
+            {label:'创建时间',value:this.mainData.billdate},
+            {label:'状态',value:this.mainData.status},
+          ]
+        },
+      ]
+    },
+    createTreeData (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          amount:node['amount'],
+          attinfos:node['attinfos'],
+          changeby: node["changeby"],
+          changedate:node['changedate'],
+          changeuserid:node['changeuserid'],
+          confirm_value:node['confirm_value'],
+          finishby:node['finishby'],
+          parentid:node['parentid'],
+          remarks:node['remarks'],
+          sa_workorder_nodeid:node['sa_workorder_nodeid'],
+          sa_workorderid:node['sa_workorderid'],
+          sequence:node['sequence'],
+          status:node['status'],
+          textcontent:node['textcontent'],
+          workname:node['workpresetjson'].workname,
+          additem:node['workpresetjson'].additem,
+          addperson:node['workpresetjson'].amountpay,
+          confirm_options:node['workpresetjson'].confirm_options,
+          confirm:node['workpresetjson'].confirm,
+          contractupload:node['workpresetjson'].contractupload,
+          fileupload:node['workpresetjson'].fileupload,
+          itemtype:node['workpresetjson'].itemtype,
+          remarks:node['workpresetjson'].remarks,
+          required:node['workpresetjson'].required,
+          textedit:node['workpresetjson'].textedit,
+          children: [],
+        }
+          
+        if (node.child && node.child.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.child.length; index++) {
+          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+          elNode.children.push(convertToElementTree(node.child[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
     },
     // 监听切换数据,上一页,下一页
     pageChange (id,rowindex,tabIndex) {
       this.flag = false
       tabIndex = this.$route.query.tabIndex
-      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      this.$router.replace({path:'/workorderDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
       this.queryMainData(id)
     },
     onSuccess(){

src/HDrpManagement/serveWorkBill/modules/taskDetail/contentTable.vue

@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName">
+      <el-tab-pane label="培训人员" name="培训人员"></el-tab-pane>
+      <el-tab-pane label="培训商品" name="培训商品"></el-tab-pane>
+    </el-tabs>
+    <slot :name="activeName"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data() {
+    return {
+      activeName:'培训人员'
+    };
+  },
+  computed:{
+  },
+  watch:{
+  },
+  methods: {},
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/index.vue

@@ -0,0 +1,167 @@
+<template>
+  <div class="brand">
+    <!-- <div style="display:flex;align-items:center;margin-bottom:16px">
+      <el-input
+          placeholder="请输入搜索内容"
+          suffix-icon="el-icon-search"
+          v-model="params.content.where.condition"
+          style="width:200px"
+          size="mini"
+          class="input-with-select inline-16"
+          @keyup.native.enter="department(params.content.pageNumber=1)"
+          @clear="department(params.content.pageNumber = 1)"
+          clearable>
+      </el-input>
+    </div> -->
+    <el-table
+      :data="data"
+      stripe
+      border
+      row-key="sa_workorder_nodeid"
+      size="small"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      <el-table-column
+        width="120">
+      </el-table-column>
+      <el-table-column
+        prop="workname"
+        label="工作名称"
+        show-overflow-tooltip
+        width="400">
+        <template slot-scope="scope">
+          <span :style="scope.row.status == 0 ? 'color:#3874f6' : scope.row.status == 2 ? 'color:orange' : 'color:red'">{{scope.row.workname}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="remarks"
+        show-overflow-tooltip
+        label="操作说明"
+        width="400">
+        <template slot-scope="scope">
+          {{scope.row.itemclassfullname ? scope.row.itemclassfullname : '--'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="fileupload"
+        label="上传附件">
+        <template slot-scope="scope">
+          {{scope.row.fileupload ? scope.row.fileupload == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="textedit"
+        label="上传文本">
+        <template slot-scope="scope">
+          {{scope.row.textedit ? scope.row.textedit == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="confirm_options"
+        label="确认项">
+        <template slot-scope="scope">
+          {{scope.row.confirm_options ? scope.row.confirm_options == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+       <el-table-column
+        prop="contractupload"
+        label="上传合同">
+        <template slot-scope="scope">
+          {{scope.row.contractupload ? scope.row.contractupload == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="additem"
+        label="添加商品">
+        <template slot-scope="scope">
+          {{scope.row.additem ? scope.row.additem == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="itemtype"
+        label="商品类型">
+        <template slot-scope="scope">
+          {{scope.row.itemtype ? scope.row.itemtype == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="addperson"
+        label="添加人员">
+        <template slot-scope="scope">
+          {{scope.row.addperson ? scope.row.addperson == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="amountpay"
+        label="是否有偿">
+        <template slot-scope="scope">
+          {{scope.row.amountpay ? scope.row.amountpay == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="required"
+        label="是否验证工作"
+        width="120px">
+        <template slot-scope="scope">
+          {{scope.row.required ? scope.row.required == 1 ? '非必填' : '必填' : '无'}}
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        width="250"
+        fixed="right">
+        <template slot-scope="scope">
+          <slot name="detail" :data="scope.row"></slot>
+          <slot name="edit" :data="scope.row"></slot>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- <div style="margin-top:16px;text-align:right">
+      <el-pagination
+          background
+          small
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page="params.content.pageNumber"
+          :page-size="params.content.pageSize"
+          layout="total, prev, pager, next, jumper"
+          :total="total">
+      </el-pagination>
+    </div> -->
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  components:{
+  },
+  data() {
+    return {
+      tableData:[],
+    }
+  },
+  created() {
+  },
+  mounted () {
+  },
+  methods: {
+    
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.department()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.department()
+    },
+  },
+  mounted () {
+  }
+};
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/selectPeople.vue

@@ -0,0 +1,58 @@
+<template>
+  <div> 
+    <el-drawer :visible.sync="visible" append-to-body size="50%">
+      
+    </el-drawer>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id": 20230206091703,
+        "version":1,
+        "content": {
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/selectProduct.vue

@@ -0,0 +1,108 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          border>
+          <el-table-column
+            prop="billno"
+            label="单号">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            label="经销商编号">
+          </el-table-column>
+          <el-table-column
+            prop="enterprisename"
+            label="经销商">
+          </el-table-column>
+          <el-table-column
+            prop="reason"
+            label="申请原因">
+          </el-table-column>
+          <el-table-column
+            prop="billdate"
+            label="提交日期">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            width="90">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id": 20230206091703,
+        "version":1,
+        "content": {
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+  },
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/taskListDetail.vue

@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="detailBtn">详 情</el-button>
+    <el-drawer append-to-body :show-close="false" :visible.sync="dialogFormVisible" size="40%">
+      <div slot="title" style="font-size: 15px">
+        工序节点详情
+      </div>
+      <div class="drawer__panel">
+        <el-descriptions v-if="detailData" :column="1">
+            <el-descriptions-item label="工序内容"><span>{{ detailData.workpresetjson.workname }}</span></el-descriptions-item>
+            <el-descriptions-item label="操作说明">{{ detailData.remarks }}</el-descriptions-item>
+            <el-descriptions-item label="操作人员">{{ detailData.changeby }}</el-descriptions-item>
+            <el-descriptions-item label="状态">
+              <el-tag size="mini" v-if="detailData.status == 0">待开始</el-tag>
+              <el-tag size="mini" type="danger" v-else-if="detailData.status == 1">已完成</el-tag>
+              <el-tag size="mini" type="warning" v-else>进行中</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="是否完成">{{detailData.confirm_value}}</el-descriptions-item>
+            <el-descriptions-item label="备注">{{ detailData.remarks }}</el-descriptions-item>
+            <el-descriptions-item label="文本信息">{{ detailData.textcontent }}</el-descriptions-item>
+            <el-descriptions-item label="附件"></el-descriptions-item>
+        </el-descriptions>
+
+        <file-item 
+            :isDownLoad="true" 
+            :fileData="detailData.attinfos">
+        </file-item>
+        <contentTable v-if="detailData">
+          <tableLayout slot="培训人员" :layout="peopleTable" :data="detailData.trainers" :opwidth="200"  :custom="true" :width="false">
+            <template v-slot:customcol="scope">
+              <p>{{scope.column.data[scope.column.columnname]}}</p>
+            </template>
+          </tableLayout>
+          <tableLayout slot="培训商品" :layout="productTable" :data="detailData.titems" :opwidth="200"  :custom="true" :width="false">
+            <template v-slot:customcol="scope">
+              <p>{{scope.column.data[scope.column.columnname]}}</p>
+            </template>
+          </tableLayout>
+        </contentTable>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import contentTable from './contentTable'
+import fileItem from '@/SManagement/orderclue/components/file/index2'
+export default {
+  name: "",
+  props:['data'],
+  components:{contentTable,fileItem},
+  data(){
+    return {
+      dialogFormVisible:false,
+      detailData:'',
+      peopleTable:[],
+      productTable:[]
+    }
+  },
+  methods:{
+    async detailBtn () {
+      let res = await this.$api.requested({
+        "id": "20230209091103",
+        "version":1,
+        "content": {
+            "sa_workorderid":this.data.sa_workorderid,
+            "sa_workorder_nodeid":this.data.sa_workorder_nodeid
+        }
+      })
+      res.data[0].attinfos = this.fileType.fileList(this.data.attinfos)
+      this.detailData = res.data[0]
+      console.log(this.detailData);
+      this.dialogFormVisible = true
+    },
+    onSubmit(){
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20230208140003",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    },
+  },
+  created () {
+    this.peopleTable = this.tool.tabelCol(this.$route.name).peopleTable.tablecols
+    this.productTable = this.tool.tabelCol(this.$route.name).productTable.tablecols
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: 0;
+}
+.el-select,.el-input,.el-cascader {
+  width: 100% !important;
+}
+</style>

src/HDrpManagement/serveWorkBill/modules/taskDetail/taskListEdit.vue

@@ -0,0 +1,156 @@
+<template>
+  <div>
+    <el-button size="mini" type="text" @click="editBtn">编 辑</el-button>
+    <el-drawer title="新 建" append-to-body :show-close="false" :visible.sync="dialogFormVisible" size="600px">
+      <div slot="title" style="font-size: 15px">
+        编辑工序节点
+      </div>
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules" ref="form" label-width="140px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="操作说明:" prop="remarks">
+                <el-input type="textarea" v-model="form.remarks" placeholder="请输入操作说明"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" v-if="data.textedit == 1 || data.textedit == 11">
+              <el-form-item label="文本内容" prop="textcontent">
+                <el-input type="textarea" v-model="form.textcontent" placeholder="请输入文本内容"></el-input>
+              </el-form-item> 
+            </el-col>
+             <el-col :span="12" v-if="form.confirm">
+              <el-form-item label="是否确认" prop="isconfirm">
+                <el-radio-group v-model="form.isconfirm">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="0">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="form.isconfirm">
+              <el-form-item label="确认值:" prop="confirm_value">
+                <el-input v-model="form.confirm_value" placeholder="请输入确认值"></el-input>
+              </el-form-item>
+            </el-col>
+             <el-col :span="24">
+              <el-form-item label="异常属实" prop="isfact">
+             
+              </el-form-item>
+            </el-col>
+             <el-col :span="24">
+              <el-form-item label="异常属实" prop="isfact">
+            
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  name: "add",
+  props:['data'],
+  components:{},
+  data(){
+    return {
+      dialogFormVisible:false,
+      form:{
+        "sa_workorderid":1,
+        "sa_workorder_nodeid":22,
+        "remarks":"",
+        "textcontent":"",
+        "confirm_value":"",
+        "amount":10,
+        "isconfirm":0,
+        "team":[],
+        "trainers":[{
+            "sys_enterpriseid":1,
+            "userid":0
+        },{
+            "sys_enterpriseid":0,
+            "userid":101
+        }
+        ],
+        "traintitem":[{
+            "itemid":40,
+            "qty":10
+        }]
+
+      },
+      rules:{
+        servicetype:[
+          { required: true, message: '请选择服务类型', trigger: 'change'},
+        ],
+        enterprisename:[
+          { required: true, message: '请选择经销商', trigger: 'change'}
+        ],
+        sonum:[
+          { required: true, message: '请选择订单', trigger: 'change'},
+        ],
+      },
+      agentParam: {
+        "id":20221216145803,
+        "content": {
+
+        }
+      }
+    }
+  },
+  methods:{
+    editBtn () {
+      console.log(this.data);
+      
+      this.dialogFormVisible = true
+      this.form = Object.assign({},this.form,this.data)
+    },
+    onSubmit(){
+      console.log(this.form)
+      this.$refs['form'].validate(async (valid) => {
+        if (!valid) return false
+        if (this.form.province) {
+          this.form.city = this.form.province[1]
+          this.form.county = this.form.province[2]
+          this.form.province = this.form.province[0]
+        }
+        const res = await this.$api.requested({
+          "id": "20230206091403",
+          "version":1,
+          "content": this.form
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.$refs['form'].resetFields();
+          this.dialogFormVisible = false
+        })
+      })
+    },
+    orderChange (data) {
+      console.log(data);
+      
+      this.form.sa_orderid = data.sa_orderid
+      this.form.sonum = data.sonum
+      this.$refs.order.visible = false
+      console.log(this.form.sonum);
+      
+    },
+  },
+  created () {
+  }
+}
+</script>
+
+<style scoped>
+.dialog-footer {
+  margin-top: 0;
+}
+.el-select,.el-input,.el-cascader {
+  width: 100% !important;
+}
+</style>

src/HDrpManagement/workBillModule/index.vue

@@ -17,8 +17,6 @@
       </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'isused'">
-        {{scope.data.column.data.isused}}
-
           <el-switch disabled :active-value="1" :inactive-value="0" v-model="scope.data.column.data.isused" size="small"></el-switch>
         </div>
         <div v-else>

src/SManagement/orderclue/components/follow.vue

@@ -143,8 +143,8 @@ export default {
           "content": this.param
         })
         this.bindData = {
-          "ownertable": 'sat_ordercluefollowuplog',
-          "ownerid": res.data.sat_ordercluefollowuplogid,
+          "ownertable": 'sa_workorder_node',
+          "ownerid": 1,
           "usetype": 'default',
         }
         this.loading = true

src/components/dynamic-table/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" @row-click="rowClick" style="width:100%;min-height:300px"  border>
+    <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
+    <el-table ref="table" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini" :height="height" @row-click="rowClick" style="width:100%;min-height:300px"  border>
       <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
         <template slot-scope="scope">
           <!-- 自定义表格显示内容 -->

src/components/selectTable/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table ref="tables"  @select="aaaa" @select-all="selectAll" v-loading="loading" highlight-current-row :data="data" :header-cell-style="{background:'#EEEEEE',color:'#333'}" size="mini" :height="height" style="width:100%"  border>
+    <el-table ref="tables"  @select="aaaa" @select-all="selectAll" v-loading="loading" highlight-current-row :data="data" size="mini" :height="height" style="width:100%"  border>
         <el-table-column
         type="selection"
         width="45"