codeMan před 2 roky
rodič
revize
6a936b1c5e

+ 9 - 13
src/HDrpManagement/dispatch/modules/productlist.vue

@@ -14,12 +14,8 @@
         align="center">
       </el-table-column> -->
       <el-table-column
-        prop="rowindex"
+        prop="rowno"
         label="行号">
-      </el-table-column>
-        <el-table-column
-        prop="billno"
-        label="订单号">
       </el-table-column>
       <el-table-column
         prop="itemno"
@@ -30,31 +26,31 @@
         label="产品名称">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="batchno"
         label="品号">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="unitname"
         label="单位">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="price"
         label="单价">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="qty"
         label="发货数量">
       </el-table-column>
       <el-table-column
-        prop="itemno"
+        prop="amount"
         label="发货金额">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="undeliqty"
         label="未发货数量">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="remarks"
         label="备注">
       </el-table-column>
       <el-table-column
@@ -62,7 +58,7 @@
         label="erp即时库存">
       </el-table-column>
       <el-table-column
-        prop="itemname"
+        prop="deliedqty"
         width="120px"
         label="drp可发货数量">
       </el-table-column>

+ 15 - 4
src/HDrpManagement/orderManage/modules/add.vue

@@ -28,7 +28,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="选择经销商" prop="sys_enterpriseid">
-                <enterprise type='1' @rowClick="rowClick"></enterprise>
+                <enterprise ref="enterprise" :type="form.type == '项目订单' ? 7 : 1" @rowClick="rowClick"></enterprise>
               </el-form-item>
             </el-col>
             <el-col v-if="form.type === '促销订单'" :span="12">
@@ -42,13 +42,13 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <el-col v-if="form.type === '项目订单'" :span="12">
+            <el-col v-if="form.type === '项目订单' && form.sys_enterpriseid" :span="12">
               <el-form-item label="项目合同" prop="sa_contractid">
                 <el-popover
                   placement="bottom"
                   trigger="click"
                   v-model="visible">
-                  <orderCanUseContract @rowClick="contractClick"></orderCanUseContract>
+                  <orderCanUseContract ref="contract" @listCreate="listCreate" @rowClick="contractClick"></orderCanUseContract>
                   <el-input readonly v-model="form.contractname" slot="reference" placeholder="选择合同"></el-input>
                 </el-popover>
               </el-form-item>
@@ -170,10 +170,18 @@ export default {
     orderCanUseContract,
     orderCanUseActivity
   },
+  watch: {
+    drawer (val) {
+      if (!val) {
+        this.refresh()
+        this.$refs.form.resetFields()
+      }
+    }
+  },
   methods:{
     handleCommand (command) {
-      this.drawer = true
       this.form.type = command
+      this.drawer = true
       this.pageData()
       this.specordermx()
     },
@@ -221,6 +229,9 @@ export default {
       this.form.type === '促销订单'?this.$refs['activity'].listData(row.sys_enterpriseid):''
       this.form.type === '促销订单'?this.activityClick({}):''
     },
+    listCreate (param) {
+      param.content.sys_enterpriseid = this.form.sys_enterpriseid
+    },
     contractClick (row) {
       this.form.sa_contractid = row.sa_contractid
       this.form.sa_projectid = row.sa_projectid

+ 2 - 0
src/HDrpManagement/prodectFileData/components/fileTable.vue

@@ -40,6 +40,8 @@ export default {
       })
 
       this.list = res.data
+      console.log(this.list);
+      
     }
   },
   created() {

+ 11 - 5
src/HDrpManagement/prodectFileData/modules/add.vue

@@ -158,11 +158,15 @@ export default {
     },
     uploadSuccess(res){
       console.log("输出")
-      console.log(res)
-      this.bindEnclosure(res.data.attachmentids)
-      this.form.attinfos = this.form.attinfos.push(res.data.attachmentids)
-      console.log(this.form)
-      this.$refs['upload'].dialogUploadVisible = false
+      if(typeof res.attinfos == 'string') {
+         this.$refs.list.listData()
+      } else {
+        console.log(res)
+        this.bindEnclosure(res.data.attachmentids)
+        this.form.attinfos = this.form.attinfos.push(res.data.attachmentids)
+        this.$refs['upload'].dialogUploadVisible = false
+      }
+      
     },
     async bindEnclosure(attachmentids){
       console.log(attachmentids)
@@ -194,6 +198,8 @@ export default {
         console.log(this.attachmentids)
         console.log(this.linksids)
         this.$refs.list.listData()
+        console.log('触发');
+        
       })
     },
     /*批量绑定*/

+ 10 - 1
src/HDrpManagement/productMoneyOdd/components/editPrice.vue

@@ -17,6 +17,11 @@
                 </el-select>
               </el-form-item>
             </el-col> -->
+            <el-col :span="24">
+              <el-form-item label="牌价" prop="marketprice">
+                <el-input size="mini" placeholder="请输入牌价" v-model="form.marketprice"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="一级原价" prop="price">
                 <el-input size="mini" :disabled="true" placeholder="请输入调整价" v-model="form.oldprice1"></el-input>
@@ -101,6 +106,7 @@ export default {
         "oldprice3":'',
         "oldprice4":'',
         "oldprice5":'',
+        "marketprice":''
       },
       rules:{
         price1:[
@@ -117,6 +123,9 @@ export default {
         ],
         price5:[
           { required: true, message: '请输入5级调整价', trigger: 'blur'},
+        ],
+        marketprice:[
+          { required: true, message: '请输入牌价', trigger: 'blur'},
         ]
       }
     }
@@ -143,7 +152,7 @@ export default {
             "id": "20221025165904",
             "content": {
                 "sa_itempriceadjustid": this.$route.query.id,
-                "marketprice":this.data.marketprice,
+                "marketprice":this.form.marketprice,
                 "sa_itempriceadjust_itemsid":this.data.sa_itempriceadjust_itemsid,
                 "sa_itempriceadjust_itemprice": content
             }

+ 73 - 16
src/HDrpManagement/serveBill/components/changeBill.vue

@@ -1,41 +1,70 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="dialogFormVisible = true">转 工 单</el-button>
-    <el-dialog append-to-body :visible.sync="dialogFormVisible" width="500px">
+    <el-drawer append-to-body :show-close="false" :visible.sync="dialogFormVisible" size="500px">
       <div slot="title" style="font-size: 15px">
-        转工单
+        <span style="margin-right:16px">转工单</span>
+        <workProgress class="inline-16" />
       </div>
-      <el-row :gutter="20">
-        <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
-          <el-col :span="24">
-            <el-form-item label="服务类型" prop="type">
-              <el-select class="inline-24" v-model="form.type" placeholder="请选择状态" size="small" clearable>
-                <el-option v-for="(item,index) in serveClassList" :key="index" :label="item.value" :value="item.value"></el-option>
-              </el-select>
-            </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="90px" label-position="right" size="mini">
+            <el-col :span="24">
+              <el-form-item label="服务类型" prop="type">
+                <el-select class="inline-24" v-model="form.type" placeholder="请选择模板" size="small" clearable>
+                  <el-option v-for="(item,index) in serveClassList" :key="index" :label="item.value" :value="item.value"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="服务模板" prop="sa_workorder_templateid">
+                <el-select class="inline-24" v-model="form.sa_workorder_templateid" placeholder="请选择模板" size="small" clearable>
+                  <el-option v-for="(item,index) in serveModelList" :key="index" :label="item.name" :value="item.sa_workorder_templateid"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="负责人" prop="projectlearders">
+                <el-select class="inline-24" v-model="form.projectlearders" placeholder="请选择负责人" size="small" clearable>
+                  <el-option v-for="(item,index) in leaderList" :key="index" :label="item.name" :value="item.userid"></el-option>
+                </el-select>
+              </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>
+        <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
-    </el-dialog>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import workProgress from './workProgress'
 export default {
   name: "add",
+  components:{workProgress},
   data(){
     return {
       dialogFormVisible:false,
+      serveModelList:[],
       serveClassList:[],
+      leaderList:[],
       form:{
         type:'',
+        sa_workorder_templateid:'',
+        projectlearders:'',
         sa_serviceorderid:''
       },
       rules:{
+        sa_workorder_templateid:[
+          { required: true, message: '请选择服务模板', trigger: 'blur'},
+        ],
+        projectlearders:[
+          { required: true, message: '请选择负责人', trigger: 'blur'},
+        ],
         type:[
           { required: true, message: '请选择服务类型', trigger: 'blur'},
         ],
@@ -44,12 +73,17 @@ export default {
   },
   created () {
     this.getServeClass()
+    this.getServeModel()
+    this.getLeaderList()
   },
   methods:{
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+        
         this.form.sa_serviceorderid = this.$route.query.id
+        this.form.projectlearders = [this.form.projectlearders]
+
         const res = await this.$api.requested({
           "id": "20230207091003",
           "version":1,
@@ -62,6 +96,16 @@ export default {
         })
       })
     },
+    async getServeModel () {
+      let res = await this.$api.requested({
+        "id":20230206155803,
+        "content": {
+        }
+      })
+      this.serveModelList = res.data
+      console.log(this.serveModelList);
+      
+    },
     async getServeClass () {
       let res = await this.$api.requested({
         "id":20230206112003,
@@ -71,6 +115,19 @@ export default {
       this.serveClassList = res.data
       console.log(this.serveClassList);
       
+    },
+    async getLeaderList () {
+      let res = await this.$api.requested({
+        "id":20221102090303,
+        "content": {
+          containssub:true,
+          departmentids:[1],
+          isworker:1
+        }
+      })
+      this.leaderList = res.data
+      console.log(this.leaderList);
+      
     }
   }
 }

+ 113 - 0
src/HDrpManagement/serveBill/components/workProgress.vue

@@ -0,0 +1,113 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="70%">
+      <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"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="billno"
+            label="工单号"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="enterprisename"
+            label="工单负责人"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            label="省市县">
+            <template slot-scope="scope">
+              {{scope.row.province}}-{{scope.row.city}}-{{scope.row.county}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="address"
+            label="地址">
+          </el-table-column>
+          <el-table-column
+            prop="startdate"
+            label="需求服务开始时间"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="enddate"
+            label="需求服务结束时间"
+            width="180">
+          </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>
+    <el-button type="primary" size="mini" @click="visible=true">进 度</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  props:[],
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id": "20230208140203",
+        "version":1,
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+            "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()
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>

+ 1 - 21
src/HDrpManagement/serveBill/modules/detail.vue

@@ -189,27 +189,7 @@ export default {
             {label:'提交人',value:this.mainData.submitby},
             {label:'提交时间',value:this.mainData.submitdate},
           ]
-        },
-        {
-          title:'服务商品',
-          info: [
-            {label:'产品编号',value:this.mainData.itemno},
-            {label:'产品名称',value:this.mainData.itemname},
-            {label:'规格尺寸',value:this.mainData.psc},
-            {label:'型号',value:this.mainData.model},
-          ]
-        },
-        {
-          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},
-            {label:'结束日期',value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}`},
-          ]
-        },
+        }
       ]
     },
     // 监听切换数据,上一页,下一页

+ 19 - 9
src/HDrpManagement/servePeople/index.vue

@@ -1,21 +1,24 @@
 
 <template>
+      <!-- :oldFormPath="{
+        add:'HManagement/accountManage/modules'
+      }" -->
   <div>
     <basicLayout 
       ref="basicLayout" 
-      :oldFormPath="{
-        add:'HManagement/accountManage/modules'
-      }"
-      tableName="accountTable" 
+      tableName="staffTable" 
       idName="userid" 
-      :apiId="{query:20221031141102,del:20221031141202}"
+      :apiId="{query:20230213143003}"
       :options="options"
-      :detailPath="{
-        path:'/account_details'
-      }">
+      @listCreate="list"
+      @listData="listData">
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
-        <div>
+        <div v-if="scope.data.column.columnname == 'status'">
+          <span v-if="scope.data.column.data.status == 'ACTIVE'">启用</span>
+          <span v-else>禁用</span>
+        </div>
+        <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
       </template>
@@ -34,6 +37,13 @@ export default {
     }
   },
   methods:{
+    list (param) {
+      param.content.where.isleader = 0
+    },
+    listData (data) {
+      console.log(data);
+      
+    }
   }
 }
 

+ 103 - 0
src/HDrpManagement/serveWorkBill/modules/checkBill/index.vue

@@ -0,0 +1,103 @@
+
+<template>
+  <div>
+    <div style="display:flex;align-items:center">
+      <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="listData(params.content.pageNumber=1)"
+          @clear="clearData"
+          clearable>
+      </el-input>
+    </div>
+    <div style="margin-top: 15px">
+      <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
+        <template v-slot:customcol="scope">
+          <p>{{scope.column.data[scope.column.columnname]}}</p>
+          <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'&& scope.column.columnname != 'reason'">--</p>
+        </template>
+        <template v-slot:opreation="scope">
+          <slot name="download" :data="scope.data"></slot>
+        </template>
+      </tableLayout>
+    </div>
+    <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"],
+  data () {
+    return {
+      tableHieght:"calc(100vh - 380px)",
+      tablecols:[],
+      list:[],
+      total:0,
+      params:{
+        "id": 20230211105903,
+        "version":1,
+        "content": {
+            "sa_workorderid":'',
+            "pageNumber":1,
+            "pageSize":20,
+            "where":{
+              "condition":''
+            }
+        }
+      },
+      options:[
+      ],
+      productList:'',
+    }
+  },
+  methods:{
+    async listData(){
+      this.params.content.sa_workorderid = this.$route.query.id
+      const res = await this.$api.requested(this.params)
+      this.list = res.data
+      this.total = res.total
+      console.log(this.list)
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+    clearData(){
+      this.listData()
+    },
+    queryClick(){
+      this.listData()
+    }
+  },
+  created() {
+    this.listData()
+    this.tablecols = this.tool.tabelCol(this.$route.name).checkBillTable.tablecols
+  }
+}
+
+</script>
+<style scoped>
+
+</style>

+ 29 - 12
src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -10,7 +10,7 @@
         idname="sa_workorderid"
         ownertable="sa_workorder"
         tags=""
-        :tabs="['工序详情','详细信息']"
+        :tabs="['工序详情','确认单','详细信息']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="tags">
@@ -24,7 +24,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '新建'"
+          v-if="mainData.status == '新建' && tool.checkAuth($route.name,'join')"
         />
         <customBtn 
           btnName="开始"
@@ -34,7 +34,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '待开始'"
+          v-if="mainData.status == '待开始' && tool.checkAuth($route.name,'start')"
 
         />
         <customBtn 
@@ -45,7 +45,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '进行中'"
+          v-if="mainData.status == '进行中' && tool.checkAuth($route.name,'stop')"
 
         />
         <customBtn 
@@ -56,7 +56,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '暂停中'"
+          v-if="mainData.status == '暂停中' && tool.checkAuth($route.name,'used')"
 
         />
         <customBtn 
@@ -67,7 +67,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status != '新建'"
+          v-if="mainData.status != '新建' && tool.checkAuth($route.name,'complete')"
 
         />
         <customBtn 
@@ -78,13 +78,13 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '新建'"
+          v-if="mainData.status == '新建' && tool.checkAuth($route.name,'delete')"
         />
       </div>
       <div slot="slot0" >
         <taskDetail :data="nodes">
           <template v-slot:detail="scope">
-              <taskListDetail class="inline-16" :data="scope.data"></taskListDetail>
+              <taskListDetail v-if="tool.checkAuth($route.name,'workDetail')" class="inline-16" :data="scope.data"></taskListDetail>
           </template>
           <!-- <template v-slot:edit="scope">
             <taskListEdit class="inline-16" :data="scope.data"/>
@@ -92,8 +92,14 @@
         </taskDetail>
       </div>
       <div slot="slot1" >
+        <checkBill>
+          <template v-slot:download="scope">
+            <el-button v-if="tool.checkAuth($route.name,'checkBillDetail')" type="text" size="mini" @click="downLoadBill(scope.data)">单 据 下 载</el-button>
+          </template>
+        </checkBill>
+      </div>
+      <div slot="slot2" >
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
-        
       </div>
     </basicDetails>
   </div>
@@ -104,6 +110,7 @@ import detailInfo from '@/components/detailInfo/index'
 import taskDetail from './taskDetail/index'
 import taskListDetail from './taskDetail/taskListDetail'
 import taskListEdit from './taskDetail/taskListEdit'
+import checkBill from './checkBill/index'
 export default {
   name: "detail",
   data() {
@@ -118,7 +125,8 @@ export default {
     detailInfo,
     taskDetail,
     taskListDetail,
-    taskListEdit
+    taskListEdit,
+    checkBill
   },
   methods:{
     async queryMainData(id) {
@@ -128,8 +136,6 @@ export default {
           "sa_workorderid": this.$route.query.id
         }
       })
-      console.log(res.data,'111');
-      
       this.mainData = res.data
       this.changeDataStructure()
       console.log(res.data.nodes);
@@ -138,6 +144,13 @@ export default {
       console.log(this.mainData);
             
     },
+    downLoadBill (data) {
+      if(data.attinfos.length == 0) return this.$message({
+        type:'warning',
+        message:'暂无单据信息'
+      })      
+      window.open(data.attinfos[0].url,'_self')
+    },
     changeDataStructure() {
       let that = this
       this.mainAreaData = [
@@ -153,6 +166,10 @@ export default {
           label:'工单类型',
           value:this.mainData.type
         },
+        {
+          label:'负责人',
+          value:this.mainData.projectleader
+        },
         {
           label:'状态',
           value:this.mainData.status,

+ 0 - 4
src/HDrpManagement/serveWorkBill/modules/taskDetail/taskListDetail.vue

@@ -38,10 +38,6 @@
           </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>

+ 26 - 0
src/HManagement/marketing2/agent/details/index.vue

@@ -19,6 +19,28 @@
     </div>
     <div slot="customOperation">
       <!-- 此区域提供了自定义操作按钮 -->
+      <customBtn 
+          btnName="启用"
+          message="确认启用当前经销商吗?"
+          idName="20230212101703"
+          keyName="sa_agentsids"
+          :id="[$route.query.id]"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          :paramData="[{key:'status',value:'启用'}]"
+          v-if="mainData.status == '禁用' && tool.checkAuth($route.name,'handleused')"
+        />
+        <customBtn 
+          btnName="禁用"
+          message="确认禁用当前经销商吗?"
+          idName="20230212101703"
+          keyName="sa_agentsids"
+          :id="[$route.query.id]"
+          @onSuccess="queryMainData"
+          class="inline-16"
+          :paramData="[{key:'status',value:'禁用'}]"
+          v-if="mainData.status == '启用' && tool.checkAuth($route.name,'handleused')"
+        />
     </div>
     <div slot="slot0">
       <el-button size="small" type="primary" @click="createAgentAccount" class="normal-margin">创建团队账号</el-button>
@@ -131,6 +153,10 @@ export default {
           label:'是否服务经销商',
           value: this.mainData.isservice
         },
+        {
+          label:'状态',
+          value: this.mainData.status
+        },
         {
           label:'签约日期',
           value: this.mainData.signdate

+ 1 - 1
src/SManagement/orderclue/components/follow.vue

@@ -143,7 +143,7 @@ export default {
           "content": this.param
         })
         this.bindData = {
-          "ownertable": 'sa_workorder_node',
+          "ownertable": 'sa_workorder_confirmation',
           "ownerid": 1,
           "usetype": 'default',
         }

+ 3 - 0
src/template/orderCanUseContract/index.vue

@@ -92,6 +92,9 @@ export default {
       this.$emit('rowClick',row)
     }
   },
+  created () {
+    this.$emit('listCreate',this.param)
+  },
   mounted () {
     this.listData()
   }