项目、客户、线索标签修改

src/HDrpManagement/logistics/details/index.vue

@@ -18,7 +18,7 @@
         <div slot="customOperation" >
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec') && mainData.status =='审核'" :disabled="mainData.status == '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" @click="onCheck" :disabled="mainData.status == '收货'">{{mainData.status === '审核'?'反审':'审核' }}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>
@@ -28,7 +28,7 @@
           <dismx ref="dismx"></dismx>
         </div>
         <div  slot="slot2">
-          <addBox v-if="tool.checkAuth($route.name,'addBoxInfo')" class="mt-10" @onSuccess="onBoxSuccess"></addBox>
+          <addBox v-if="tool.checkAuth($route.name,'addBoxInfo') && mainData.status == '新建'" class="mt-10" @onSuccess="onBoxSuccess"></addBox>
           <boxlist :data="mainData" v-if="tool.checkAuth($route.name,'boxInfo') && mainData" ref="boxlist"></boxlist>
           <el-empty description="暂无查询权限" v-else></el-empty>
         </div>

src/HDrpManagement/logistics/details/tabs/courierRecords.vue

@@ -27,7 +27,17 @@ export default {
           "sa_logisticsid":this.$route.query.id
         }
       })
-      this.list = res.data.data
+      console.log(res.data)
+      if (res.code === 0){
+        this.$notify({
+          title: '警告',
+          message: JSON.parse(res.msg).message,
+          type: 'warning'
+        });
+      }else {
+        this.list = res.data.data
+      }
+
     }
   },
   mounted () {
@@ -37,4 +47,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -11,8 +11,8 @@
         <p class="normal-title mt-10">
           装箱信息
         </p>
-        <el-form style="width:500px" label-position="right" label-width="80px" :model="form" size="small">
-          <el-form-item label="箱码">
+        <el-form style="width:500px" label-position="right" label-width="80px" :model="form"  ref="form" :rules="rules" size="small">
+          <el-form-item label="箱码" prop="boxnum">
             <el-input v-model="form.boxnum" placeholder="输入箱码"></el-input>
           </el-form-item>
           <el-form-item label="备注">
@@ -97,9 +97,17 @@ export default {
   data () {
     return {
       drawer:false,
-      form:{},
+      form:{
+        boxnum:'',
+        remarks:''
+      },
       setcol:24,
-      tableData:[]
+      tableData:[],
+      rules:{
+        boxnum: [
+          { required: true, message: '请输入箱码', trigger: 'blur' },
+        ]
+      }
     }
   },
   components:{
@@ -107,10 +115,12 @@ export default {
     uploadAllData
   },
   methods:{
-    async onSubmit (){
-      const res = await this.$api.requested({
-        "id": "20230109155104",
-        "content": {
+   onSubmit (){
+      this.$refs.form.validate(async(valid)=>{
+        if (!valid) return false
+        const res = await this.$api.requested({
+          "id": "20230109155104",
+          "content": {
             "sa_logisticsid":this.$route.query.id,
             "sa_logistics_boxid": 0,
             "boxnum": this.form.boxnum,
@@ -123,15 +133,17 @@ export default {
                 "remarks": e.remarks
               }
             })
-        }
-      })
-      this.tool.showMessage(res,()=>{
-        this.form = {}
-        this.tableData = []
-        this.setcol = 24
-        this.$emit('onSuccess')
-        this.drawer = false
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.form = {}
+          this.tableData = []
+          this.setcol = 24
+          this.$emit('onSuccess')
+          this.drawer = false
+        })
       })
+
     },
     async handlePullData () {
       let res = await this.$api.requested({
@@ -151,7 +163,7 @@ export default {
         const res2 = new Map();
         this.tableData = this.tableData.filter((item) => !res2.has(item['itemno']) && res2.set(item['itemno'], 1));
         this.$refs.logislist.tableData = []
-      } 
+      }
     },
     showSelect () {
       this.$refs['logislist'].listData()
@@ -166,11 +178,11 @@ export default {
         if (e.itemno !== row.itemno)
         return e
       })
-      
+
     }
   }
 }
 
 </script>
 <style>
-</style>
+</style>

src/HDrpManagement/publicCustomer/index.vue

@@ -100,7 +100,7 @@
         </div>
         <div  class="mt-10">
           <label class="search__label">标签:</label>
-          <el-select  class="inline-16" v-model="selectParam.tag" size="small" placeholder="请选择" @change="selectChange" clearable>
+          <el-select  class="inline-16" v-model="selectParam.tag" size="small" placeholder="请选择" @change="selectChange" clearable multiple>
             <el-option
                 v-for="item in option.tagData"
                 :key="item.tag"

src/HManagement/accountManage/modules/account_detail.vue

@@ -28,7 +28,7 @@
         <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
       <div slot="slot1" >
-        <teamInformation></teamInformation>
+        <teamInformation :data="mainData"></teamInformation>
       </div>
       <div class="container normal-panel" slot="slot2" >
         <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">

src/HManagement/accountManage/modules/teamInformation/add.vue

@@ -104,9 +104,11 @@ export default {
           "pageSize": 20,
           "containssub":1,
           "isAll":1,
+          "userid":'',
           "departmentids":[],
           "where": {
             "condition": "",
+            "addproxy":1
           }
         }
       }
@@ -121,10 +123,10 @@ export default {
     },
     onShow(){
       this.drawer = true
+      this.param.content.userid = this.data.userid
       this.listData()
     },
     async selectData(row){
-      console.log(row)
       const res = await this.$api.requested({
         "id":"20230302174301",
         "content":{

src/HManagement/accountManage/modules/teamInformation/index.vue

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
       <el-tab-pane label="负责的" name="负责的">
         <div style="margin-bottom: 15px">
-          <add  class="inline-16"  @addSuccess="leaderData"></add>
+          <add  class="inline-16"  @addSuccess="leaderData" :data="data"></add>
 <!--          <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="leader.params.content.where.condition?leader.params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="leader.params.content.where.condition"
                      @keyup.native.enter="leaderData(leader.params.content.pageNumber = 1)" @clear="leaderData(leader.params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>-->
@@ -92,6 +92,7 @@ import detail from './detail'
 export default {
   name: "index",
   components:{add,detail},
+  props:["data"],
   data(){
     return {
       tablecols:[],

src/HManagement/clueManage/clue_private/index.vue

@@ -47,7 +47,7 @@
         </div>
         <div class="mt-10">
           <p class="search__label">标签:</p>
-          <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.tag = tag;$refs.basicLayout.listData()">
+          <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.tag = tag;$refs.basicLayout.listData()" multiple>
             <el-option v-for="item in tagData" :label="item.tag" :key="item.tag" :value="item.tag">
             </el-option>
           </el-select>

src/HManagement/clueManage/clue_public/index.vue

@@ -32,7 +32,7 @@
       </div>
       <div class="mt-10">
         <p class="search__label">标签:</p>
-        <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.tag = tag;$refs.basicLayout.listData()">
+        <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.tag = tag;$refs.basicLayout.listData()" multiple>
           <el-option v-for="item in tagData" :label="item.tag" :key="item.tag" :value="item.tag">
           </el-option>
         </el-select>

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -94,7 +94,7 @@
         </div>
         <div  class="mt-10">
           <label class="search__label">标签:</label>
-          <el-select  class="inline-16" v-model="selectParam.tag" size="small" placeholder="请选择" @change="selectChange" clearable>
+          <el-select  class="inline-16" v-model="selectParam.tag" size="small" placeholder="请选择" @change="selectChange" clearable multiple>
             <el-option
                 v-for="item in option.tagData"
                 :key="item.tag"

src/SManagement/orderclue/index.vue

@@ -53,7 +53,7 @@
       </div>
       <div class="mt-10">
         <p class="search__label">标签:</p>
-        <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.tag = tag;$refs.list.listData()">
+        <el-select v-model="tag" clearable style="margin-right:10px" size="small" placeholder="请选择标签" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.tag = tag;$refs.list.listData()" multiple>
           <el-option v-for="item in tagData" :label="item.tag" :key="item.tag" :value="item.tag">
           </el-option>
         </el-select>