bug修复

src/HDrpManagement/workReport/index.vue

@@ -8,45 +8,50 @@
       <div slot="content">
         <div class="handle-header">
 
-              <div class="select-btn">
-                <div @click="selectFun('我收到的')"
-                     :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">我收到的</div>
-                <div @click="selectFun('我发出的')"
-                     :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">我发出的</div>
-              </div>
-
-              <el-input
-                  style="width:200px"
-                  class="inline-24"
-                  size="small"
-                  suffix-icon="el-icon-search"
-                  placeholder="搜索"
-                  @input="valueChange"
-                  v-model="condition"
-                  @keyup.enter.native="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()"
-                  @clear="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()" clearable></el-input>
-
-
-              <el-button-group class="inline-24">
-                <el-button size="small" :type="number === 1?'primary':''"  @click="dateChange(1)">今天</el-button>
-                <el-button size="small" :type="number === 2?'primary':''" @click="dateChange(2)">最近三天</el-button>
-                <el-button size="small" :type="number === 3?'primary':''" @click="dateChange(3)">最近一周</el-button>
-              </el-button-group>
-
-              <span style="line-height: 30px;vertical-align: center" class="search__label" >时间筛选：</span>
-              <el-date-picker
-                  style="margin-right: 25px"
-                  v-model="date"
-                  @change="dateChange"
-                  type="daterange"
-                  size="small"
-                  value-format="yyyy-MM-dd"
-                  range-separator="至"
-                  start-placeholder="开始日期"
-                  end-placeholder="结束日期">
-              </el-date-picker>
-
-             <el-button size="small" type="text" @click="onClear">清空</el-button>
+          <div class="select-btn" style="margin: 5px 0 5px 10px">
+            <div @click="selectFun('我收到的')"
+                 :style="currentItem==1 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">我收到的</div>
+            <div @click="selectFun('我发出的')"
+                 :style="currentItem==0 ? 'background:#3874F6;color:#ffffff' : 'border:1px solid #cccccc'">我发出的</div>
+          </div>
+
+          <el-input
+              style="width:200px;margin: 5px 0 5px 10px"
+              class="inline-24"
+              size="small"
+              suffix-icon="el-icon-search"
+              placeholder="搜索"
+              @input="valueChange"
+              v-model="condition"
+              @keyup.enter.native="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()"
+              @clear="$refs.aside.params.content.where.condition=condition;$refs.aside.params.content.pageNumber=1;$refs.aside.listData()" clearable></el-input>
+
+
+
+          <el-button-group class="inline-24" style="margin: 5px 0 5px 10px">
+            <el-button size="small" :type="number === 1?'primary':''"  @click="dateChange(1)">今天</el-button>
+            <el-button size="small" :type="number === 2?'primary':''" @click="dateChange(2)">最近三天</el-button>
+            <el-button size="small" :type="number === 3?'primary':''" @click="dateChange(3)">最近一周</el-button>
+          </el-button-group>
+
+          <div>
+            <span style="line-height: 30px;vertical-align: center;margin: 5px 0 5px 10px" class="search__label" >时间筛选：</span>
+            <el-date-picker
+                style="margin-right: 25px"
+                v-model="date"
+                @change="dateChange"
+                type="daterange"
+                size="small"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期">
+            </el-date-picker>
+          </div>
+
+          <el-button size="small" type="text" @click="onClear" style="margin: 5px 0 5px 10px">清空</el-button>
+
+
 
         </div>
         <div class="content">
@@ -183,6 +188,7 @@ export default {
 }
 .handle-header {
   display: flex;
+  flex-wrap: wrap;
   margin-top: 10px;
   margin-bottom: 10px;
 }

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -239,7 +239,7 @@ export default {
       this.form = Object.assign({},this.form,this.data)
      /* this.form.enterprisename = this.data.enterprisename_customer*/
       this.form.province = [this.data.province,this.data.city,this.data.county]
-      this.form.enterprisename = this.data.enterprisename_customer
+      /*this.form.enterprisename = this.data.enterprisename_customer*/
       this.form.begdate_due = this.form.begdate_due || ''
       this.form.enddate_due = this.form.enddate_due || ''
       this.form.totalinvestment !== 0 ? this.form.totalinvestment =  this.tool.formatAmount(this.form.totalinvestment,2): this.form.totalinvestment =''

src/SDrpManagement/ProductGroup/index.vue

@@ -175,8 +175,8 @@ export default {
         path:'/groupDetail',
         query: {
           id:id.sa_itemgroupid,
-          /*brandid:id.sa_brandid,
-          sys_enterpriseid: this.sys_enterpriseid ? this.sys_enterpriseid : ''*/
+          brandid:id.sa_brandid,
+          sys_enterpriseid: this.sys_enterpriseid ? this.sys_enterpriseid : ''
         }
       })
     },

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

@@ -156,11 +156,11 @@ export default {
   methods: {
     async getDetail () {
       this.param.content.sa_itemgroupid = this.$route.query.id
-     /* if (this.$route.query.sys_enterpriseid) {
+      if (this.$route.query.sys_enterpriseid) {
         this.param.content.sys_enterpriseid = this.$route.query.sys_enterpriseid
       } else {
         delete this.param.content.sys_enterpriseid
-      }*/
+      }
       let res = await this.$api.requested(this.param)
       res.code === 0 ?this.$message.error(res.msg): ''
       this.details = res.data

src/SManagement/archives_sc/archives_details/detail.vue

@@ -5,7 +5,7 @@
         <p class="title">{{currentSelectFile.classname}} {{currentSelectFile.title}}</p>
         <div class="info1">
           <p>发布者: {{currentSelectFile.createby}}</p>
-          <p>发布时间: {{currentSelectFile.createdate}}</p>
+          <p>发布时间: {{currentSelectFile.checkdate}}</p>
         </div>
       </div>
      </div>
@@ -144,4 +144,4 @@ export default {
 .el-drawer__body .file1 .title {
   margin-bottom: 20px;
 }
-</style>
+</style>