Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/Form/accountclass/add.vue

@@ -7,22 +7,27 @@
       </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-col :span="24">
             <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-col :span="24">
             <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-col :span="6">
+            <el-form-item>
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isrebate">是否返利账户</el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <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-col :span="6">
             <el-form-item  >
               <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" checked="checked">是否启用</el-checkbox>
             </el-form-item>
@@ -50,7 +55,8 @@ export default {
         accountno:'',
         accountname:'',
         isorder:'',
-        isused:0
+        isused:0,
+        isrebate:0
       },
       rules:{
         accountno:[

src/Form/accountclass/edit.vue

@@ -7,26 +7,31 @@
       </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-col :span="24">
             <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-col :span="24">
             <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-col :span="6">
+            <el-form-item>
+              <el-checkbox :disabled="!!form.isused" :true-label="1" :false-label="0" v-model="form.isrebate">是否返利账户</el-checkbox>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
             <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" >允许订货</el-checkbox>
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isorder" checked="checked">允许订货</el-checkbox>
             </el-form-item>
           </el-col>
-          <el-col :span="10">
+          <el-col :span="6">
             <el-form-item  >
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" >是否启用</el-checkbox>
+              <el-checkbox :true-label="1" :false-label="0" v-model="form.isused" checked="checked">是否启用</el-checkbox>
             </el-form-item>
           </el-col>
         </el-form>
@@ -51,7 +56,9 @@ export default {
         "accountno":"",
         "accountname":"",
         "isorder":'',
-        "isused":''
+        "isused":'',
+        isrebate:0
+
       },
       rules:{
         accountno:[
@@ -65,8 +72,9 @@ export default {
   },
   methods:{
     onShow(){
-      this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
+      this.dialogFormVisible = true
+
       console.log(this.form)
     },
     onSubmit(){

src/HDrpManagement/accountclass/index.vue

@@ -1,12 +1,18 @@
 <template>
   <div>
-    <basicLayout ref="list" formPath="accountclass" tableName="accountclassTable" idName="sa_accountclassid" :apiId="{query:20221008134803,del:20221008134903}" :options="options">
+    <basicLayout ref="list" formPath="accountclass" tableName="accountclassTable" idName="sa_accountclassid" :apiId="{query:20221008134803,del:20221008134903}" :options="options"
+      @listData="list"
+    >
       <div slot="custom"></div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'isorder'">
           <span v-if="scope.data.column.data[scope.data.column.columnname] === 1">是</span>
           <span v-else>否</span>
         </div>
+        <div v-else-if="scope.data.column.columnname === 'accountname'">
+          <span style="margin-right:10px">{{scope.data.column.data.accountname}}</span>
+          <el-tag v-if="scope.data.column.data.isrebate" size="mini">返利金账户</el-tag>
+        </div>
         <div v-else-if="scope.data.column.columnname === 'isused'">
           <span v-if="scope.data.column.data[scope.data.column.columnname] === 1">是</span>
           <span v-else>否</span>
@@ -37,6 +43,10 @@ export default {
   methods:{
     onSuccess () {
       this.$refs['list'].listData()
+    },
+    list (data) {
+      console.log(data);
+      
     }
   }
 }

src/HDrpManagement/serveBill/components/changeBill.vue

@@ -9,20 +9,25 @@
       <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-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> -->
             <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-form-item label="工单模板" prop="sa_workorder_templateid">
+                <el-select class="inline-24" @change="modelChange" 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="type">
+                <el-input size="mini" type="text" placeholder="工单类型" :disabled="true" v-model="form.type"></el-input>
+              </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>
@@ -72,7 +77,6 @@ export default {
     }
   },
   created () {
-    this.getServeClass()
     this.getServeModel()
     this.getLeaderList()
   },
@@ -82,8 +86,7 @@ export default {
         if (!valid) return false
         
         this.form.sa_serviceorderid = this.$route.query.id
-        this.form.projectlearders = [this.form.projectlearders]
-
+        typeof this.form.projectlearders == 'number' ? this.form.projectlearders = [this.form.projectlearders] : ''
         const res = await this.$api.requested({
           "id": "20230207091003",
           "version":1,
@@ -96,6 +99,9 @@ export default {
         })
       })
     },
+    modelChange (data) {
+      this.form.type = this.serveModelList.find(item => item.sa_workorder_templateid == data).type   
+    },
     async getServeModel () {
       let res = await this.$api.requested({
         "id":20230206155803,
@@ -104,17 +110,6 @@ export default {
       })
       this.serveModelList = res.data
       console.log(this.serveModelList);
-      
-    },
-    async getServeClass () {
-      let res = await this.$api.requested({
-        "id":20230206112003,
-        "content": {
-        }
-      })
-      this.serveClassList = res.data
-      console.log(this.serveClassList);
-      
     },
     async getLeaderList () {
       let res = await this.$api.requested({

src/HDrpManagement/serveBill/components/selectOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div> 
-    <el-dialog :visible.sync="visible" append-to-body width="50%">
+    <el-dialog :visible.sync="visible" append-to-body width="60%">
       <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>

src/HDrpManagement/serveWorkBill/modules/detail.vue

@@ -16,7 +16,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <customBtn 
+        <!-- <customBtn 
           btnName="接单"
           message="确认接单当前服务工单吗?"
           idName="20230210101103"
@@ -36,7 +36,7 @@
           class="inline-16"
           v-if="mainData.status == '待开始' && tool.checkAuth($route.name,'start')"
 
-        />
+        /> -->
         <customBtn 
           btnName="暂停"
           message="确认暂停当前服务工单吗?"
@@ -56,10 +56,10 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '暂停中' && tool.checkAuth($route.name,'used')"
+          v-if="mainData.status == '暂停' && tool.checkAuth($route.name,'used')"
 
         />
-        <customBtn 
+        <!-- <customBtn 
           btnName="完结"
           message="确认完结当前服务工单吗?"
           idName="20230209144903"
@@ -69,7 +69,7 @@
           class="inline-16"
           v-if="mainData.status != '新建' && tool.checkAuth($route.name,'complete')"
 
-        />
+        /> -->
         <customBtn 
           btnName="作废"
           message="确认作废当前服务工单吗?"
@@ -78,7 +78,7 @@
           :id="$route.query.id"
           @onSuccess="queryMainData"
           class="inline-16"
-          v-if="mainData.status == '新建' && tool.checkAuth($route.name,'delete')"
+          v-if="mainData.status != '完结' && tool.checkAuth($route.name,'delete')"
         />
       </div>
       <div slot="slot0" >
@@ -141,7 +141,7 @@ export default {
       console.log(res.data.nodes);
       
       this.nodes = this.createTreeData(res.data.nodes)
-      console.log(this.mainData);
+      console.log(this.nodes);
             
     },
     downLoadBill (data) {

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

@@ -1,8 +1,8 @@
 <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 v-model="activeName" v-if="data.addperson || data.additem">
+      <el-tab-pane v-if="data.addperson" label="培训人员" name="培训人员"></el-tab-pane>
+      <el-tab-pane v-if="data.additem" label="培训商品" name="培训商品"></el-tab-pane>
     </el-tabs>
     <slot :name="activeName"></slot>
   </div>
@@ -11,9 +11,10 @@
 <script>
 export default {
   name: '',
+  props:['data'],
   data() {
     return {
-      activeName:'培训人员'
+      activeName:''
     };
   },
   computed:{
@@ -21,6 +22,9 @@ export default {
   watch:{
   },
   methods: {},
+  mounted () {
+    this.data.addperson ? this.activeName = '培训人员' : this.data.additem ? '培训商品' : ''
+  }
 };
 </script>
 

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

@@ -38,7 +38,7 @@
         label="操作说明"
         width="400">
         <template slot-scope="scope">
-          {{scope.row.itemclassfullname ? scope.row.itemclassfullname : '--'}}
+          {{scope.row.remarks ? scope.row.remarks : '--'}}
         </template>
       </el-table-column>
       <el-table-column
@@ -59,7 +59,7 @@
         prop="confirm_options"
         label="确认项">
         <template slot-scope="scope">
-          {{scope.row.confirm_options ? scope.row.confirm_options == 1 ? '非必填' : '必填' : '无'}}
+          {{scope.row.confirm ? scope.row.confirm == 1 ? '非必填' : '必填' : '无'}}
         </template>
       </el-table-column>
        <el-table-column

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

@@ -5,27 +5,33 @@
       <div slot="title" style="font-size: 15px">
         工序节点详情
       </div>
-      <div class="drawer__panel">
+      <div class="drawer__panel" v-if="detailData">
         <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.workpresetjson.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="是否完成" v-if="detailData.workpresetjson.confirm">
+              <el-radio-group :disabled="true" v-model="detailData.confirm_value">
+                <el-radio label="是">是</el-radio>
+                <el-radio label="否">否</el-radio>
+              </el-radio-group>
+            </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-item label="文本信息" v-if="detailData.workpresetjson.textedit">{{ detailData.textcontent }}</el-descriptions-item>
+            <el-descriptions-item label="附件" v-if="detailData.workpresetjson.fileupload"></el-descriptions-item>
         </el-descriptions>
 
         <file-item 
-            :isDownLoad="true" 
-            :fileData="detailData.attinfos">
+          v-if="detailData.workpresetjson.fileupload"
+          :isDownLoad="true" 
+          :fileData="detailData.attinfos">
         </file-item>
-        <contentTable v-if="detailData">
+        <contentTable v-if="detailData" :data="detailData.workpresetjson">
           <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>

src/HDrpManagement/serveWorkBillTask/components/add.vue

@@ -15,7 +15,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="操作说明" prop="remarks">
-                <el-input type="textarea" v-model="form.remarks" placeholder="请输入工作名"></el-input>
+                <el-input type="textarea" v-model="form.remarks" placeholder="请输入操作说明"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -148,18 +148,18 @@ export default {
       dialogFormVisible:false,
       form:{
         "sa_workpresetid":0,     //sa_brandid<=0时 为新增
-        "additem":11,
-        "addperson":11,
+        "additem":0,
+        "addperson":0,
         "workname":"",
         "remarks":"",
         "itemtype":"",
-        "contractupload":11,
-        "fileupload":11,
-        "textedit":11,
+        "contractupload":0,
+        "fileupload":0,
+        "textedit":0,
         "confirm":0,
-        "amountpay":11,
-        "required":1,
-        "signature":1,
+        "amountpay":0,
+        "required":0,
+        "signature":0,
         "confirm_options":"['是','否']"
       },
       rules:{

src/HDrpManagement/serveWorkBillTask/components/edit.vue

@@ -15,7 +15,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="操作说明" prop="remarks">
-                <el-input type="textarea" v-model="form.workname" placeholder="请输入工作名"></el-input>
+                <el-input type="textarea" v-model="form.workname" placeholder="请输入操作说明"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -149,18 +149,18 @@ export default {
       dialogFormVisible:false,
       form:{
         "sa_workpresetid":0,     //sa_brandid<=0时 为新增
-        "additem":11,
-        "addperson":11,
+        "additem":0,
+        "addperson":0,
         "workname":"",
         "remarks":"",
         "itemtype":"",
-        "contractupload":11,
-        "fileupload":11,
-        "textedit":11,
+        "contractupload":0,
+        "fileupload":0,
+        "textedit":0,
         "confirm":0,
-        "amountpay":11,
-        "required":1,
-        "signature":1,
+        "amountpay":0,
+        "required":0,
+        "signature":0,
         "confirm_options":"['是','否']"
       },
       rules:{

src/HDrpManagement/workBillModule/components/add.vue

@@ -3,7 +3,7 @@
     <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">
@@ -39,8 +39,8 @@ export default {
       dialogFormVisible:false,
       form:{
         "sa_workorder_templateid":0,     //sa_brandid<=0时 为新增
-        "name":"培训工单",
-        "type":"安装培训"
+        "name":"",
+        "type":""
       },
       rules:{
         name:[

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

@@ -36,7 +36,7 @@
         label="操作说明"
         width="400">
         <template slot-scope="scope">
-          {{scope.row.itemclassfullname ? scope.row.itemclassfullname : '--'}}
+          {{scope.row.remarks ? scope.row.remarks : '--'}}
         </template>
       </el-table-column>
       <el-table-column