代码更新

src/Form/projectTask/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="(drawer = true)">新 建</el-button>
     <el-drawer
-      title="新建项目工作任务"
+      title="新建项目评估工作"
       :visible.sync="drawer"
       direction="rtl"
       append-to-body
@@ -43,7 +43,7 @@
         <div class="normal-margin">
           <div class="normal-margin flex-align-center flex-between">
             <p class="normal-title">评估项</p>
-            <el-button type="primary" size="small" @click="addOptions">添加任务</el-button>
+            <el-button type="primary" size="small" @click="addOptions">添加</el-button>
           </div>
           <el-table
               :data="form.projtaskmag_options"
@@ -57,7 +57,7 @@
             </el-table-column>
             <el-table-column
                 prop="optionname"
-                label="任务内容"
+                label="评估项"
                 width="360">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.optionname" placeholder=""></el-input>

src/Form/projectTask/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="mini" type="primary" @click="onShow(drawer = true)">编 辑</el-button>
     <el-drawer
-      title="编辑项目工作任务"
+      title="编辑项目评估工作"
       :visible.sync="drawer"
       direction="rtl"
       append-to-body
@@ -43,7 +43,7 @@
         <div class="normal-margin">
           <div class="normal-margin flex-align-center flex-between">
             <p class="normal-title">评估项</p>
-            <el-button type="primary" size="small" @click="addOptions">添加任务</el-button>
+            <el-button type="primary" size="small" @click="addOptions">添加</el-button>
           </div>
           <el-table
               ref="projtaskmag_options"
@@ -58,7 +58,7 @@
             </el-table-column>
             <el-table-column
                 prop="optionname"
-                label="任务内容"
+                label="评估项"
                 width="360">
               <template slot-scope="scope">
                 <el-input v-model="scope.row.optionname" placeholder=""></el-input>

src/Form/publicCustomer/add.vue

@@ -568,6 +568,8 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+      console.log("行业列表")
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -576,7 +578,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -584,6 +586,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -592,7 +595,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/Form/publicCustomer/edit.vue

@@ -516,6 +516,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -524,7 +525,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -532,6 +533,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -540,7 +542,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/Form/salerPrivatecustomer/add.vue

@@ -532,6 +532,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -540,7 +541,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -611,6 +612,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -619,7 +621,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -642,6 +644,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -650,7 +653,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/Form/salerPrivatecustomer/edit.vue

@@ -434,6 +434,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -442,7 +443,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -486,6 +487,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -494,7 +496,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -508,6 +510,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -516,7 +519,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/Form/salerPublicCustomer/detail/edit.vue

@@ -193,6 +193,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -201,7 +202,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -233,6 +234,7 @@ export default {
     },
     /*客户等级*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -241,7 +243,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -249,6 +251,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -257,7 +260,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/Form/salerPublicCustomer/edit.vue

@@ -193,6 +193,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -201,7 +202,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -233,6 +234,7 @@ export default {
     },
     /*客户等级*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -241,7 +243,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -249,6 +251,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -257,7 +260,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/HDrpManagement/ProductMag/detail/index.vue

@@ -68,7 +68,7 @@
       <div slot="slot1">
         <saleClass ref="saleClass" :data="mainData">
           <template v-slot:addClass="scope">
-            <addClass v-if="tool.checkAuth($route.name,'salerClass')" :data="scope.data" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
+            <addClass v-if="tool.checkAuth($route.name,'salerClass') && mainData.status === '新建'" :data="scope.data" @onSuccess="$refs.saleClass.listData();queryMainData($route.query.id)"/>
           </template>
         </saleClass>
       </div>
@@ -175,9 +175,27 @@ export default {
           label:'领域',
           value:this.mainData.tradefield.map(item => item.tradefield).join(',')
         },
-        {
+        /*{
           label:'上/下架',
           value:this.mainData.isonsale ? '上架' : '下架'
+        },*/
+        {
+          label:'上/下架',
+          value:this.mainData.isonsale ? '上架' : '下架',
+          style:function () {
+            let style = {}
+            switch (that.mainData.isonsale) {
+              case 1:
+                style = {color:"#3874f6"}
+                break;
+              case 0:
+                style = {color:"#333333"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label:'是否工具',

src/HDrpManagement/contractManage/components/addContract.vue

@@ -19,7 +19,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="500">
-                  <selectAgent ref="member" typemx="经销商合作协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member"  typemx="经销商合作协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择经销商"></el-input>
                 </el-popover>
               </el-form-item>
@@ -94,7 +94,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="500">
-                  <selectAgent ref="member" typemx="经销项目协议" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" typemx="经销项目协议" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -106,7 +106,7 @@
                   trigger="manual"
                   v-model="projectVisible"
                   width="600">
-                  <seleteProject ref="project" type="1" :sys_enterpriseid='form.sys_enterpriseid' @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
+                  <seleteProject ref="project" type="2" :sys_enterpriseid='form.sys_enterpriseid' @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
                   <el-input readonly type="text" slot="reference" size="small" v-model="form.projectname" @focus="showChange('projectVisible')"></el-input>
                 </el-popover>
               </el-form-item>
@@ -191,7 +191,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="500">
-                  <selectAgent ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="2" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -305,7 +305,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="500">
-                  <selectAgent ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="2" ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -363,7 +363,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="500">
-                  <selectAgent ref="member" :type="false" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" type="1" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>

src/HDrpManagement/contractManage/components/editContract.vue

@@ -19,7 +19,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="400">
-                  <selectAgent ref="member" typemx="经销商合作协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" typemx="经销商合作协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -94,7 +94,7 @@
                   trigger="manual"
                   v-model="agentVisible"
                   width="400">
-                  <selectAgent ref="member" typemx="经销项目协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" typemx="经销项目协议" :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -191,7 +191,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="400">
-                  <selectAgent ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="2" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -305,7 +305,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="400">
-                  <selectAgent ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="2" ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -363,7 +363,7 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="400">
-                  <selectAgent ref="member" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>

src/HDrpManagement/dispatch/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button size="small" type="primary" @click="onShow(dialogTableVisible = true)">新建发货单</el-button>
     <el-dialog append-to-body title="选择发货订单" :visible.sync="dialogTableVisible" width="700px">
-      <el-input style="width:200px;" class="mt-10 inline-16" placeholder="请输入订单号" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" clearable>
+      <el-input style="width:200px;" class="mt-10 inline-16" placeholder="请输入" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" clearable>
       </el-input>
       <el-date-picker
         class="inline-16"
@@ -24,6 +24,7 @@
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号"></el-table-column>
         <el-table-column prop="enterprisename" label="企业名称"></el-table-column>
+        <el-table-column prop="checkdate" label="审核时间"></el-table-column>
         <el-table-column prop="remarks" label="备注"></el-table-column>
         <el-table-column label="操作" width="90">
           <template slot-scope="scope">

src/HDrpManagement/orderManage/details/index.vue

@@ -19,7 +19,7 @@
           <changeSaler class="inline-16" ref="saler" @selectRow="salerChange">
             <el-button v-if="tool.checkAuth($route.name,'changeSaler')" type="primary" slot="input" size="mini" @click="$refs.saler.visible=true;$refs.saler.listData()">变更业务员</el-button>
           </changeSaler>
-          <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'confirmDate') && mainData.status === '交期待确认'"  class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
             placement="top"
@@ -37,12 +37,12 @@
               <el-button size="mini" type="text" @click="visible = false">取消</el-button>
               <el-button  type="primary" size="mini" @click="onSubmit('审核')">确定</el-button>
             </div>
-            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine')"  :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" type="primary" size="mini" slot="reference">审 核</el-button>
+            <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine') && mainData.status === '提交' && mainData.status === '交期确认'"   type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover>
-          <el-button v-if="tool.checkAuth($route.name,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交' && mainData.status !== '交期待确认'" type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'close')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="closeOrder">关 闭</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'examine') && mainData.status === '审核'"  type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status === '提交' && mainData.status === '交期待确认'"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'submit') && mainData.status === '新建'" type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'close') && mainData.status === '审核'"  type="primary" size="mini" @click="closeOrder">关 闭</el-button>
           <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
       </div>
       <div slot="slot0">

src/HDrpManagement/orderManage/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button :disabled="data.status !=='新建'" type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button>
+    <el-button v-if="data.status ==='新建'"  type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button>
     <!-- <el-button type="primary" size="mini" @click="onShow(drawer = true)">编 辑</el-button> -->
     <el-drawer
     :visible.sync="drawer"

src/HDrpManagement/prodectFileData/modules/add.vue

@@ -141,6 +141,7 @@ export default {
     },
     /*资料类别明细*/
     async typeDetails(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -149,7 +150,7 @@ export default {
           "pageSize": 20,
           "typename": "technicalinfotype",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/HDrpManagement/prodectFileData/modules/edit.vue

@@ -113,6 +113,7 @@ export default {
     },
     /*资料类别明细*/
     async typeDetails(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -121,7 +122,7 @@ export default {
           "pageSize": 20,
           "typename": "technicalinfotype",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -34,7 +34,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent ref="member" typemx="经销项目协议" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" typemx="经销项目协议" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -132,7 +132,7 @@
                     trigger="manual"
                     v-model="accountVisible"
                     width="500">
-                  <selectAgent ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="2" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -246,7 +246,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent ref="member" :type="false" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="1" ref="member" :type="false" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -498,6 +498,8 @@ export default {
         this.tool.showMessage(res,() => {
           /*this.changeData(this.productObj)*/
           this.$emit('addSuccess')
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/quotedPriceDetail',query:{id:res.data.sa_quotedpriceid,rowindex:res.data.rowindex}})
         })
       })
     },

src/HDrpManagement/publicCustomer/index.vue

@@ -289,6 +289,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -297,7 +298,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -306,6 +307,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -314,7 +316,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -337,6 +339,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -345,7 +348,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/HManagement/ecycle/customer/index.vue

@@ -208,6 +208,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -216,7 +217,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -227,6 +228,7 @@ export default {
     },
     /*客户等级*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -235,7 +237,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -252,6 +254,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -260,7 +263,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/HManagement/marketing2/agent/details/index.vue

@@ -162,6 +162,7 @@ export default {
       this.queryMainData(id)
     },
     changeDataStructure () {
+      let that = this
       this.mainAreaData = [
         {
           label:'经销商编号',
@@ -177,7 +178,21 @@ export default {
         },
         {
           label:'状态',
-          value: this.mainData.status
+          value:this.mainData.status,
+          style:function () {
+            let style = {}
+            switch (that.mainData.status) {
+              case '启用':
+                style = {color:"#52C41A"}
+                break;
+              case '禁用':
+                style = {color:"#d90a0a"}
+                break;
+              default:
+                break;
+            }
+            return style
+          }
         },
         {
           label:'签约日期',

src/HManagement/marketing2/agent/index.vue

@@ -38,6 +38,10 @@
             <p v-if="scope.data.column.columnname === 'province'">
               {{`${scope.data.column.data.province}-${scope.data.column.data.city}-${scope.data.column.data.county}`}}
             </p>
+            <p v-else-if="scope.data.column.columnname === 'status'">
+              <span style="color:#d90a0a" v-if="scope.data.column.data[[scope.data.column.columnname]] == '禁用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+              <span style="color:#52C41A" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '启用'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
+            </p>
             <p v-else-if="scope.data.column.columnname === 'isservice'">
               {{scope.data.column.data.isservice ? '是' : '否'}}
             </p>

src/HManagement/task/modules/detail.vue

@@ -15,7 +15,7 @@
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
         <complete-task :data="mainData" v-if="tool.checkAuth($route.name,'complete')" style="display:inline" @onSuccess="queryMainData()"></complete-task>
-        <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete')" type="primary" size="mini" @click="deleteTask">删 除</el-button>
+        <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete') && !disable" type="primary" size="mini" @click="deleteTask">删 除</el-button>
       </div>
       <div slot="slot0" class="task__content">
         <p class="mt-10">标题:{{mainData.title}}</p>
@@ -36,7 +36,8 @@ export default {
   data() {
     return {
       mainData:{},
-      mainAreaData:{}
+      mainAreaData:{},
+      disable:false
     }
   },
   computed:{
@@ -58,6 +59,9 @@ export default {
       this.mainData = res.data
       this.changeDataStructure()
       this.$refs['details'].$refs['group'].queryGroup()
+      console.log(this.mainData.createuserid)
+      console.log(JSON.parse(sessionStorage.getItem('active_account')).userid)
+      this.mainData.createuserid === JSON.parse(sessionStorage.getItem('active_account')).userid ?this.disable = false : this.disable = true
 
     },
     changeDataStructure() {

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -37,7 +37,7 @@
         <div class="content normal-margin">
           <p class="inline-16">更多规格:</p>
           <el-tag class="inline-16" style="margin-top: 5px;margin-bottom: 5px" @click="typeClick(item)" v-for="(item,index) in detail" :key="index" size="small" :effect="selectProduct.itemno == item.itemno ? 'dark' : 'plain'">
-            {{item.model.length >10?item.model.substring(0,9)+'...':item.model}}
+            {{item.model.length >20?item.model.substring(0,19)+'...':item.model}}
           </el-tag>
 <!--          <span style="color: #4f7bfd;width: 100px"  @click="typeClick(item)" v-for="(item,index) in detail" :key="index">
               {{item.model}}

src/SDrpManagement/Products/modules/list.vue

@@ -30,10 +30,12 @@
             <div class="bottom">
               <p class="title">{{item.itemname}}</p>
               <p class="descript">商品编号：{{item.itemno}}</p>
-              <p class="descript">所属营销分类：<span v-for="cls in item.itemclass" :key="cls.index">{{cls.itemclassname}},</span></p>
+              <p class="descript">规格：{{item.spec}}</p>
+              <p class="descript">型号：{{item.model}}</p>
+<!--              <p class="descript">所属营销分类：<span v-for="cls in item.itemclass" :key="cls.index">{{cls.itemclassname}},</span></p>-->
               <div class="flex-align-center flex-between">
 <!--                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<small class="text-throughline">¥{{item.oldprice}}</small></p>-->
-                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;</p>
+                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<span>/{{item.unitname}}</span></p>
                 <div class="shopcart-btn">
                   <i @click.stop="insertToShopCart(item)" style="font-size:1.5rem;color:#666" class="el-icon-shopping-cart-2"></i>
                 </div>

src/SDrpManagement/QuotedPrice/modules/ProjectQuotationAdd.vue

@@ -501,6 +501,8 @@ export default {
         this.tool.showMessage(res,() => {
           this.drawer = false
           this.$emit('addSuccess')
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/quotedPriceDetail',query:{id:res.data.sa_quotedpriceid,rowindex:res.data.rowindex}})
         })
       })
     },

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -259,6 +259,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -267,7 +268,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -278,6 +279,7 @@ export default {
     },
     /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -286,7 +288,7 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -309,6 +311,7 @@ export default {
     },
     /*行业列表*/
     async industryList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -317,7 +320,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -20,6 +20,11 @@
             <el-col :span="4">
               <businessMessage :keyWord="form.enterprisename_customer" @businessData="onBusinessData"></businessMessage>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="企业简称:" prop="abbreviation">
+                <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" >
               <el-form-item label="客户类型:" prop="type">
                 <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 100%">
@@ -35,15 +40,22 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户来源:" >
-                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+              <el-form-item label="客户等级:" >
+                <el-select v-model="form.customergrade" placeholder="请选择客户等级" style="width: 100%">
+                  <el-option
+                      v-for="item in options.customerClassification"
+                      :key="item.rowindex"
+                      :label="item.value "
+                      :value="item.value">
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户等级:" >
-                <el-select v-model="form.customergrade" placeholder="请选择客户等级" style="width: 100%">
+              <el-form-item label="客户分类:" >
+                <el-select v-model="form.customergrade" placeholder="请选择客户分类" style="width: 100%">
                   <el-option
-                      v-for="item in options.gradeData"
+                      v-for="item in options.customerClassification"
                       :key="item.rowindex"
                       :label="item.value "
                       :value="item.value">
@@ -52,12 +64,29 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业简称:" prop="abbreviation">
-                <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
+              <el-form-item  label="客户行业:" >
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="form.industry"
+                    multiple
+                    placeholder="请选择所属行业"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in options.industryData"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                  >
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                  </el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业税号:" prop="taxno">
+              <el-form-item label="税号:" prop="taxno">
                 <el-input v-model="form.taxno" placeholder="请输入企业税号" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
@@ -67,15 +96,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="所属行业:" >
-                <el-select v-model="form.industry" placeholder="请选择所属行业" style="width: 100%">
-                  <el-option
-                      v-for="item in options.industryData"
-                      :key="item.value"
-                      :label="item.value"
-                      :value="item.value">
-                  </el-option>
-                </el-select>
+              <el-form-item label="电话:" prop="contact">
+                <el-input v-model="form.telephone" placeholder="请输入电话" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -89,12 +111,12 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业地址:" prop="address">
+              <el-form-item label="详细地址:" prop="address">
                 <el-input v-model="form.address" placeholder="请输入企业地址" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="上级客户:" >
+              <el-form-item label="上级企业:" >
                 <el-popover
                     placement="bottom"
                     width="700"
@@ -150,6 +172,11 @@
                 </el-popover>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="客户来源:" >
+                <el-input v-model="form.source" placeholder="请输入客户来源" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>
@@ -205,7 +232,7 @@ export default {
         "abbreviation": "", //非必填，可选
         "taxno": "", //税号,非必填，可选
         "grade": '', // 客户等级（商户等级）
-        "industry": "", //非必填，可选，所属行业
+        "industry": [], //非必填，可选，所属行业
         "contact": "", //非必填，可选
         "phonenumber": "", //非必填，可选
         "customergrade": "", //客户等级
@@ -232,7 +259,10 @@ export default {
         type:[],
         parentCustomers:[],
         gradeData:[],
-        industryData:[]
+        industryData:[],
+        customerGrade:[],
+        customerClassification:[],
+        distributor:[]
       },
     }
   },
@@ -401,8 +431,9 @@ export default {
       this.form = Object.assign({},this.form,{province:val[0],city:val[1],county:val[2]})
 
     },
-    /*客户等级*/
+    /*客户分类*/
     async gradeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -411,14 +442,31 @@ export default {
           "pageSize": 20,
           "typename": "customergrade",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
-      this.options.gradeData = res.data
+      console.log("客户等级",res.data)
+      /*for (var i=0;i<res.data.length; i++){
+        if (res.data[i].remarks !== ''){
+          this.options.gradeData[i] = res.data[i].value + "——" + res.data[i].remarks
+        }else{
+          this.options.gradeData[i] = res.data[i].value
+        }
+      }*/
+      this.options.customerClassification = res.data
+      console.log("处理后客户等级",this.options.customerClassification)
+    },
+    /*客户等级*/
+    queryCustomerGrade(){
+      this.$store.dispatch('optiontypeselect','agentgrade').then(res=>{
+        this.options.customerGrade = res.data
+      })
     },
     /*行业列表*/
     async industryList(){
+      console.log("行业类别")
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -427,7 +475,7 @@ export default {
           "pageSize": 20,
           "typename": "industry",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })
@@ -463,6 +511,7 @@ export default {
     },
     /*客户类型列表*/
     async typeList(){
+      const siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
       const res = await this.$api.requested({
         "classname": "sysmanage.develop.optiontype.optiontype",
         "method": "optiontypeselect",
@@ -471,7 +520,7 @@ export default {
           "pageSize": 20,
           "typename": "customertypemx",
           "parameter": {
-            "siteid": "YOSTEST2"
+            "siteid": siteid
           }
         }
       })

src/components/detailInfo/index.vue

@@ -9,7 +9,9 @@
   <div v-else>
     <div class="container">
       <el-descriptions title="基本信息" border>
-        <el-descriptions-item v-for="(item,index) in data.baseInfo" :key="index" :label="item.label">{{ item.value ? item.value : '--' }}</el-descriptions-item>
+        <el-descriptions-item v-for="(item,index) in data.baseInfo" :key="index" :label="item.label">
+          <span :style="item.style?item.style():''">{{ item.value ? item.value : '--' }}</span>
+        </el-descriptions-item>
       </el-descriptions>
     </div>