信息调整，组织架构

src/Form/marketing2/saler/add.vue

@@ -57,7 +57,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="24">
-                <el-form-item  prop="discountrate" label-width="132px">
+                <el-form-item  prop="iseditprice" label-width="132px">
                   <!-- <el-input  v-model="form.discountrate" placeholder="请输入最低授权折扣" @change="discountrateChange(form.discountrate)"></el-input> -->
                   <el-checkbox :true-label="1" :false-label="0" v-model="form.iseditprice">是否可编辑订单价格</el-checkbox>
                 </el-form-item>

src/Form/marketing2/saler/edit.vue

@@ -103,7 +103,7 @@ export default {
   methods:{
     onShow(){
       this.form = Object.assign({},this.form,this.data)
-      this.form.discountrate = this.form.discountrate * 100
+      this.form.discountrate = Math.round((this.form.discountrate*100)*100)/100
       this.$nextTick(() => {
         console.log(this.$refs)
         this.$refs.salerName.value.name = this.data.name
@@ -113,8 +113,8 @@ export default {
     onClose(){
       this.dialogVisible = false
       this.$refs.form.resetFields()
-      this.$refs.selectMenber.value.name = ''
-      this.$refs.selectMenber.value.hrid = ''
+    /*  this.$refs.selectMenber.value.name = ''
+      this.$refs.selectMenber.value.hrid = ''*/
       this.form = {
         "sa_saleareaid":'',
         "hrid":'',
@@ -126,10 +126,11 @@ export default {
       this.form = Object.assign({},this.form,data)
     },
     onSubmit(){
-      this.form.discountrate = (this.form.discountrate/100).toFixed(4)
+
       console.log(this.form)
       this.$refs.form.validate(async(valid) =>{
         if (!valid) return false
+        this.form.discountrate = (this.form.discountrate/100).toFixed(4)
         const res = await this.$api.requested({
           "id": 20221011144703,
           "content": this.form

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -34,7 +34,7 @@
             <el-date-picker
               style="width:150px"
               v-if="data.status === '新建'"
-              v-model="value2"
+              v-model="value1"
               value-format="yyyy-MM-dd"
               slot="reference"
               align="right"
@@ -46,19 +46,35 @@
             <span v-else>需求日期</span>
           </div>
           <div v-if="scope.column.columnname == 'deliverydate'">
-            <el-date-picker
-              style="width:180px"
-              v-if="type === 'confirmdate'"
-              v-model="value2"
-              value-format="yyyy-MM-dd"
-              slot="reference"
-              align="right"
-              type="date"
-              size="mini"
-              placeholder="一键回复交期"
-              @change="dateChange">
-            </el-date-picker>
-            <span v-else>回复交期</span>
+            <div v-if="siteid === 'NB'">
+              <el-date-picker
+                  style="width:180px"
+                  v-model="value2"
+                  value-format="yyyy-MM-dd"
+                  slot="reference"
+                  align="right"
+                  type="date"
+                  size="mini"
+                  placeholder="一键回复交期"
+                  @change="dateChange">
+              </el-date-picker>
+            </div>
+            <div v-else>
+              <el-date-picker
+                  style="width:180px"
+                  v-if="type === 'confirmdate'"
+                  v-model="value2"
+                  value-format="yyyy-MM-dd"
+                  slot="reference"
+                  align="right"
+                  type="date"
+                  size="mini"
+                  placeholder="一键回复交期"
+                  @change="dateChange">
+              </el-date-picker>
+              <span v-else>回复交期</span>
+            </div>
+
           </div>
         </template>
         <template v-slot:customcol="scope">
@@ -577,6 +593,7 @@ export default {
       total:0,
       currentPage:0,
       time: null,
+      value1:'',
       value2:'',
       stockOptions:[],
       totalPage:0,
@@ -720,7 +737,7 @@ export default {
         "id": 20230104143802,
         "content": {
           "sa_orderid": this.data.sa_orderid,
-          "needdate": this.value2
+          "needdate": this.value1
         },
       })
       this.listData()
@@ -799,6 +816,7 @@ export default {
           "deliverydate": this.value2
         },
       })
+      this.listData()
     },
     selectionChange (selection) {
       this.$emit('select',selection)

src/HManagement/department/staff/list/modules/add.vue

@@ -5,129 +5,136 @@
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" label-width="100px">
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="编号:" prop="hrcode">
-              <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="性别">
-              <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
-                <el-option
-                  v-for="item in sys_options"
-                  :key="item.index"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="姓名:" prop="name">
-              <el-input v-model="form.name" placeholder="输入姓名" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="电子邮箱:" prop="email">
-              <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-<!--          <el-col class="mb-30" :span="12">
-            <el-form-item label="手机号码:" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>-->
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="身份证号:">
-              <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:" prop="depname">
-              <el-popover
-                placement="bottom"
-                width="400"
-                trigger="click"
-                v-model="visible">
-                <el-tree
-                  :data="deplist"
-                  node-key="id"
-                  default-expand-all
-                  highlight-current
-                  :expand-on-click-node="false"
-                  @node-click="nodeClick"
-                >
-                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <span>{{ node.label }}</span>
-                    <span>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
+          <el-row>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="编号:" prop="hrcode">
+                <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="性别">
+                <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
+                  <el-option
+                    v-for="item in sys_options"
+                    :key="item.index"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="姓名:" prop="name">
+                <el-input v-model="form.name" placeholder="输入姓名" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="电子邮箱:" prop="email">
+                <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+  <!--          <el-col class="mb-30" :span="12">
+              <el-form-item label="手机号码:" prop="phonenumber">
+                <el-input v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>-->
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="身份证号:">
+                <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="部门:" prop="depname">
+                <el-popover
+                  placement="bottom"
+                  width="400"
+                  trigger="click"
+                  v-model="visible">
+                  <el-tree
+                    :data="deplist"
+                    node-key="id"
+                    default-expand-all
+                    highlight-current
+                    :expand-on-click-node="false"
+                    @node-click="nodeClick"
+                  >
+                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                      <span>{{ node.label }}</span>
+                      <span>
+                        <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                        <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
+                      </span>
                     </span>
-                  </span>
-                </el-tree>
-                <el-input slot="reference" v-model="form.depname" readonly placeholder="请选择" autocomplete="off"></el-input>
-              </el-popover>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="办公电话:">
-              <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
+                  </el-tree>
+                  <el-input slot="reference" v-model="form.depname" readonly placeholder="请选择" autocomplete="off"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="办公电话:">
+                <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="职位:">
-              <el-input v-model="form.position" placeholder="输入职位" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="汇报对象:">
-              <selectMenber @selectMenber="selectMenber"></selectMenber>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5" style="height:51px">
-            <el-form-item>
-              <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态:">
-              <el-radio-group v-model="form.status">
-                <el-radio :label="0">在职</el-radio>
-                <el-radio :label="1">离职</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">是否上图员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" @change="salerChange">是否业务员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
-            <el-form-item label="营销区域:">
-              <areaList :areaname="form.areaname" @selectArea="selectArea" @areaList="areaLists" ref="area"></areaList>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
-            <el-form-item label="最低授权折扣(%):" prop="discountrate" label-width="132px">
-              <el-input v-model="form.discountrate" placeholder="输入最低授权折扣" autocomplete="off" @change="discountrateChange(form.discountrate)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5" v-if="form.issalehr == '1'">
-            <el-form-item>
-              <el-checkbox v-model="form.iseditprice" :false-label="0" :true-label="1">是否可编辑订单价格</el-checkbox>
-            </el-form-item>
-          </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="职位:">
+                <el-input v-model="form.position" placeholder="输入职位" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="汇报对象:">
+                <selectMenber @selectMenber="selectMenber"></selectMenber>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" >
+              <el-form-item label="状态:">
+                <el-radio-group v-model="form.status">
+                  <el-radio :label="0">在职</el-radio>
+                  <el-radio :label="1">离职</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col class="mb-30" :span="5" style="height:51px">
+              <el-form-item>
+                <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
+              </el-form-item>
+            </el-col>
+
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">是否上图员</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" @change="salerChange">是否业务员</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
+              <el-form-item label="营销区域:">
+                <areaList :areaname="form.areaname" @selectArea="selectArea" @areaList="areaLists" ref="area"></areaList>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
+              <el-form-item label="最低授权折扣(%):" prop="discountrate" label-width="132px">
+                <el-input v-model="form.discountrate" placeholder="输入最低授权折扣" autocomplete="off" @change="discountrateChange(form.discountrate)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5" v-if="form.issalehr == '1'">
+              <el-form-item>
+                <el-checkbox v-model="form.iseditprice" :false-label="0" :true-label="1">是否可编辑订单价格</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-row>
     </div>

src/HManagement/department/staff/list/modules/edit.vue

@@ -5,131 +5,137 @@
     <div class="drawer__panel">
       <el-row :gutter="20">
         <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" label-width="100px">
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="编号:" prop="hrcode">
-              <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="性别">
-              <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
-                <el-option
-                  v-for="item in sys_options"
-                  :key="item.index"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="姓名:" prop="name">
-              <el-input v-model="form.name" placeholder="输入姓名" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="电子邮箱:" prop="email">
-              <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-<!--          <el-col class="mb-30" :span="12">
-            <el-form-item label="手机号码:" prop="phonenumber">
-              <el-input v-if="form.accountno === ''" v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off" ></el-input>
-              <el-input v-else v-model="form.userphonenumber" placeholder="输入手机号码" autocomplete="off" disabled></el-input>
-            </el-form-item>
-          </el-col>-->
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="身份证号:">
-              <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:" prop="depname">
-              <el-popover
-                placement="bottom"
-                width="400"
-                trigger="click"
-                v-model="visible">
-                <el-tree
-                  :data="deplist"
-                  node-key="id"
-                  default-expand-all
-                  highlight-current
-                  @node-click="nodeClick"
-                  :expand-on-click-node="false">
-                  <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <span>{{ node.label }}</span>
-                    <span>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
-                      <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
+          <el-row>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="编号:" prop="hrcode">
+                <el-input v-model="form.hrcode" placeholder="输入人员编号" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="性别">
+                <el-select v-model="form.sex" style="width:100%" placeholder="请选择">
+                  <el-option
+                    v-for="item in sys_options"
+                    :key="item.index"
+                    :label="item.value"
+                    :value="item.value">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="姓名:" prop="name">
+                <el-input v-model="form.name" placeholder="输入姓名" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="电子邮箱:" prop="email">
+                <el-input v-model="form.email" placeholder="输入电子邮箱" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+  <!--          <el-col class="mb-30" :span="12">
+              <el-form-item label="手机号码:" prop="phonenumber">
+                <el-input v-if="form.accountno === ''" v-model="form.phonenumber" placeholder="输入手机号码" autocomplete="off" ></el-input>
+                <el-input v-else v-model="form.userphonenumber" placeholder="输入手机号码" autocomplete="off" disabled></el-input>
+              </el-form-item>
+            </el-col>-->
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="身份证号:">
+                <el-input v-model="form.idcard" placeholder="输入身份证号" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="部门:" prop="depname">
+                <el-popover
+                  placement="bottom"
+                  width="400"
+                  trigger="click"
+                  v-model="visible">
+                  <el-tree
+                    :data="deplist"
+                    node-key="id"
+                    default-expand-all
+                    highlight-current
+                    @node-click="nodeClick"
+                    :expand-on-click-node="false">
+                    <span class="custom-tree-node" slot-scope="{ node, data }">
+                      <span>{{ node.label }}</span>
+                      <span>
+                        <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-if="data.departmentid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                        <el-button size="small" type="text" @click="selectDep(data,visible=false)" v-else >选 择</el-button>
+                      </span>
                     </span>
-                  </span>
-                </el-tree>
-                <el-input slot="reference" v-model="form.depname" readonly placeholder="请选择" autocomplete="off"></el-input>
-              </el-popover>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="办公电话:">
-              <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
+                  </el-tree>
+                  <el-input slot="reference" v-model="form.depname" readonly placeholder="请选择" autocomplete="off"></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="办公电话:">
+                <el-input v-model="form.officetelephone" placeholder="输入办公电话" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
 
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="职位:">
-              <el-input v-model="form.position" placeholder="输入职位" autocomplete="off"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12">
-            <el-form-item label="汇报对象:">
-              <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"></selectMenber>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5" style="height:51px">
-            <el-form-item>
-              <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态:">
-              <el-radio-group v-model="form.status">
-                <el-radio label="0">在职</el-radio>
-                <el-radio label="1">离职</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">是否上图员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5">
-            <el-form-item>
-              <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" :disabled="issalehr == '1'">是否业务员</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
-            <el-form-item label="营销区域:">
-              <el-input v-if="issalehr == 1" v-model="form.areaname" placeholder="选择营销区域" autocomplete="off" disabled></el-input>
-              <areaList v-else :areaname="form.areaname" @selectArea="selectArea" @areaList="areaLists"></areaList>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="职位:">
+                <el-input v-model="form.position" placeholder="输入职位" autocomplete="off"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="汇报对象:">
+                <selectMenber :reporthrname="form.reporthrname" @selectMenber="selectMenber"></selectMenber>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12">
+              <el-form-item label="状态:">
+                <el-radio-group v-model="form.status">
+                  <el-radio label="0">在职</el-radio>
+                  <el-radio label="1">离职</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col class="mb-30" :span="5" style="height:51px">
+              <el-form-item>
+                <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.isuppictured" :false-label="0" :true-label="1">是否上图员</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5">
+              <el-form-item>
+                <el-checkbox v-model="form.issalehr" :false-label="0" :true-label="1" :disabled="issalehr == '1'">是否业务员</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
+              <el-form-item label="营销区域:">
+                <el-input v-if="issalehr == 1" v-model="form.areaname" placeholder="选择营销区域" autocomplete="off" disabled></el-input>
+                <areaList v-else :areaname="form.areaname" @selectArea="selectArea" @areaList="areaLists"></areaList>
 
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
-            <el-form-item label="最低授权折扣(%):" prop="discountrate" label-width="132px">
-              <el-input v-model="form.discountrate" placeholder="输入最低授权折扣" autocomplete="off" @change="discountrateChange(form.discountrate)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col class="mb-30" :span="5" v-if="form.issalehr == '1'">
-            <el-form-item>
-              <el-checkbox v-model="form.iseditprice" :false-label="0" :true-label="1">是否可编辑订单价格</el-checkbox>
-            </el-form-item>
-          </el-col>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="12" v-if="form.issalehr == '1'">
+              <el-form-item label="最低授权折扣(%):" prop="discountrate" label-width="132px">
+                <el-input v-model="form.discountrate" placeholder="输入最低授权折扣" autocomplete="off" @change="discountrateChange(form.discountrate)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col class="mb-30" :span="5" v-if="form.issalehr == '1'">
+              <el-form-item>
+                <el-checkbox v-model="form.iseditprice" :false-label="0" :true-label="1">是否可编辑订单价格</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </el-row>
     </div>
@@ -220,7 +226,7 @@ export default {
         }
       })
       this.form = Object.assign({},this.form, res.data)
-      this.form.discountrate = this.form.discountrate * 100
+      this.form.discountrate = Math.round((this.form.discountrate*100)*100)/100
       this.issalehr = this.form.issalehr
     },
     areaLists(val){

src/SDrpManagement/salerOrder/modules/add.vue

@@ -40,7 +40,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="form.type==='工具订单'?24:12" v-if="form.type !== '项目订单'">
-              <el-form-item label="选择经销商" prop="sys_enterpriseid">
+              <el-form-item label="选择企业" prop="sys_enterpriseid">
                 <agent ref="enterprise" ismanage="0" @rowClick="rowClick"></agent>
               </el-form-item>
             </el-col>
@@ -171,7 +171,7 @@ export default {
         }],
         sys_enterpriseid:[{
           required: true,
-          message: '订货经销商不能为空',
+          message: '订货企业不能为空',
           trigger: 'blur'
         }],
         sa_contractid:[{

src/template/orderAddCanUseAgent/index.vue

@@ -6,7 +6,7 @@
       v-model="visible">
       <div>
         <div class="flex-align-center flex-between" style="margin-bottom:10px">
-          <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="输入经销商信息" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="输入企业信息" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
           <addTemp @onSuccess="onSuccess"></addTemp>
         </div>
         <el-table
@@ -18,7 +18,7 @@
           border>
           <el-table-column
             prop="enterprisename"
-            label="经销商名称"
+            label="企业名称"
             width="180">
           </el-table-column>
           <el-table-column
@@ -50,7 +50,7 @@
           </el-pagination>
         </div>
       </div>
-      <el-input readonly :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入经销商信息" clearable></el-input>
+      <el-input readonly :validate-event="false" slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives"  placeholder="输入企业信息" clearable></el-input>
     </el-popover>
   </div>
 </template>
@@ -118,4 +118,4 @@ export default {
 
 </script>
 <style>
-</style>
+</style>

src/views/message/components/list.vue

@@ -17,8 +17,8 @@
           </div>
         </div>
         <div class="right">
-          <div class="read" v-if="item.isread == 1">已读</div>
-          <div class="no-read" v-else>未读</div>
+          <div class="read" v-if="item.isread == 0">未读</div>
+<!--          <div class="no-read" v-else>未读</div>-->
         </div>
       </div>
     </div>

src/views/message/index.vue

@@ -1,4 +1,4 @@
-<template>
+<template >
   <div class="message">
     <el-row>
       <el-col :span="12">
@@ -21,13 +21,16 @@
               </div>
             </el-col>
             <el-col :span="10">
-              <div style="float: right;margin-right: 16px">
-                <el-switch
-                    v-model="isRead"
-                    active-text="只看未读"
-                    @change="onRead"
-                >
-                </el-switch>
+              <div style="float: right;margin-right: 16px;">
+                  <el-switch
+                      style="z-index: 9999"
+                      v-model="isRead"
+                      active-text="只看未读"
+                      active-value="1"
+                      inactive-value="0"
+                      @change="readChange"
+                  >
+                  </el-switch>
               </div>
             </el-col>
           </el-row>
@@ -72,7 +75,7 @@ export default {
   data () {
     return {
       currentItem: 1,
-      isRead:false,
+      isRead:'0',
       param: {
         "classname": "system.message.Message",
         "method": "queryMessage",
@@ -113,6 +116,7 @@ export default {
       this.list.forEach(item=>{
         item.message = item.message.split("；")
       })
+      this.message = ''
       if(this.list[0]) this.messageItemClick(this.list[0])
       this.total = res.total
     },
@@ -135,7 +139,7 @@ export default {
               "messageid":data.messageid
           }
         })
-      data.isread = 1
+      /*data.isread = 1*/
       res.data.name = data.name
       res.data.link = data.link
       res.data.modules = data.modules
@@ -205,13 +209,8 @@ export default {
 
 
     },
-    onRead(val){
-      console.log(val,'val')
-      if (val){
-        this.param.content.isread = 0
-      }else {
-        this.param.content.isread = ''
-      }
+    readChange(){
+      this.isRead == '1'?this.param.content.isread = 0:this.param.content.isread = ''
       this.getMessageList()
     },