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

src/Form/publicCustomer/add.vue

@@ -176,9 +176,8 @@ export default {
           this.$emit('onSuccess')
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
-          this.$store.dispatch('changeDetailDrawer',false)
-          /*this.dispatch('changeDetailDrawer',true)*/
-          this.$router.replace({path:'/PublicCustomerDetail',query:{id:res.data.sa_customersid}})
+          this.$router.push({path:'/PublicCustomerDetail',query:{id:res.data.sa_customersid,rowindex:0}})
+          this.$store.dispatch('changeDetailDrawer',true)
         })
       })
     },

src/HDrpManagement/Creditbilladj/modules/details.vue

@@ -10,6 +10,7 @@
     idname="sa_creditbillid"
     :tags="[]"
     @pageChange="pageChange"
+    delApiId="20221008155403"
     @onEditSuccess="queryMainData($route.query.id)">
     <div slot="tags">
       <!-- 使用此插槽可不传[tags] -->

src/HDrpManagement/ProductMag/index.vue

@@ -19,7 +19,7 @@
         <counter_examine class="inline-16" :rowData="rowData" @examineSuccess="onSuccess"></counter_examine>
       </div>
       <div slot="custom">
-        <label  class="search__label" style="margin: auto;width: 70px;">是否上架:</label>
+        <label  class="search__label">是否上架:</label>
         <el-select class="inline-24" v-model="selectParam.isonsale" placeholder="请选择是否上架" @change="selectChange" size="small" clearable>
           <el-option
               v-for="item in isOnSaleData"
@@ -28,7 +28,7 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label  class="search__label" style="margin: auto;width: 40px;">状态:</label>
+        <label  class="search__label">状态:</label>
         <el-select class="inline-24" v-model="selectParam.status" placeholder="请选择状态" @change="selectChange" size="small" clearable>
           <el-option
               v-for="item in statusData"

src/HDrpManagement/ProductMag/modules/add.vue

@@ -116,11 +116,16 @@
                 <el-input v-model="form.length" placeholder="输入产品长度(mm)"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="8">
               <el-form-item label="条形码">
                 <el-input v-model="form.barcode" placeholder="输入条形码"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="交期">
+                <el-input v-model="form.delivery" placeholder="输入交期"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="备注">
                 <el-input v-model="form.remarks" type="textarea" placeholder="输入产品备注"></el-input>
@@ -133,7 +138,7 @@
                   style="margin-top:10px"
                   :folderid="folderid"
                   accept=".JPG,.PNG,.jpg,.png"
-                  btntype="image"
+                  type="image"
                   :bindData="bindData"
                   @onSuccess="uploadSuccess">
                 </uploadFile>

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -2,149 +2,156 @@
   <div class="inline-16">
     <el-button type="text" :disabled="form.status==='审核'" size="small" @click="onShow">编 辑</el-button>
     <el-drawer append-to-body title="编辑产品" :visible.sync="dialogFormVisible" size="50%">
-      <el-row class="drawer__panel" :gutter="40">
-        <el-form label-position="right" label-width="80px" :model="form" :rules="rules" ref="form" size="small">
-          <el-col :span="12">
-            <el-form-item label="产品编号" prop="itemno">
-              <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="产品名称" prop="itemname">
-              <el-input v-model="form.itemname"  placeholder="输入产品名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="型号" prop="model">
-              <el-input v-model="form.model" placeholder="输入产品型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="规格" prop="spec">
-              <el-input v-model="form.spec" placeholder="输入产品规格"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="辅助单位">
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.isauxunit" @change="isauxunitChange">是否需要辅助单位</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="主单位" prop="unitid">
-              <el-select style="width:100%" v-model="form.unitid" placeholder="请选择" @change="unitChange">
-                <el-option
-                  v-for="item in unitData"
-                  :key="item.unitid"
-                  :label="item.unitname"
-                  :value="item.unitid">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="辅助单位">
-              <el-select style="width:100%" v-model="form.unitgroupid" :disabled="form.isauxunit === 0" placeholder="请选择">
-                <el-option
-                  v-for="item in unitGroupData"
-                  :key="item.unitgroupid"
-                  :label="item.unitgroupname"
-                  :value="item.unitgroupid">
-                  <p style="float: left">{{ item.unitgroupname }}</p>
-                  <p style="float:right;color: #8492a6; font-size: 13px">{{ item.conversionrate }}{{item.unitname}}/{{item.auxunitname}},换算率:{{'1:'+ item.conversionrate}}</p>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="9">
-            <el-form-item label="换算率">
-              <el-input v-model="form.itemname" readonly></el-input>
-            </el-form-item>
-          </el-col> -->
-          <el-col :span="12">
-            <el-form-item label="起订量" prop="orderminqty">
-              <el-input placeholder="起订量" v-model="form.orderminqty" class="input-with-select">
-                <el-select style="width:100px" v-model="form.orderminqty_auxunit" slot="prepend" placeholder="请选择">
-                  <el-option label="主单位" :value="0"></el-option>
-                  <el-option :disabled="form.isauxunit === 0" label="辅助单位" :value="1"></el-option>
+      <div class="drawer__panel" >
+        <el-row :gutter="10">
+          <el-form label-position="right" label-width="80px" :model="form" :rules="rules" ref="form" size="small">
+            <el-col :span="12">
+              <el-form-item label="产品编号" prop="itemno">
+                <el-input v-model="form.itemno" placeholder="输入产品编号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="产品名称" prop="itemname">
+                <el-input v-model="form.itemname"  placeholder="输入产品名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="型号" prop="model">
+                <el-input v-model="form.model" placeholder="输入产品型号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="规格" prop="spec">
+                <el-input v-model="form.spec" placeholder="输入产品规格"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="辅助单位">
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.isauxunit" @change="isauxunitChange">是否需要辅助单位</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="主单位" prop="unitid">
+                <el-select style="width:100%" v-model="form.unitid" placeholder="请选择" @change="unitChange">
+                  <el-option
+                    v-for="item in unitData"
+                    :key="item.unitid"
+                    :label="item.unitname"
+                    :value="item.unitid">
+                  </el-option>
                 </el-select>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="增量" prop="orderaddqty">
-              <el-input placeholder="增量" v-model="form.orderaddqty" class="input-with-select">
-                <el-select style="width:100px" v-model="form.orderaddqty_auxunit" slot="prepend" placeholder="请选择">
-                  <el-option label="主单位" :value="0"></el-option>
-                  <el-option :disabled="form.isauxunit === 0" label="辅助单位" :value="1"></el-option>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="辅助单位">
+                <el-select style="width:100%" v-model="form.unitgroupid" :disabled="form.isauxunit === 0" placeholder="请选择">
+                  <el-option
+                    v-for="item in unitGroupData"
+                    :key="item.unitgroupid"
+                    :label="item.unitgroupname"
+                    :value="item.unitgroupid">
+                    <p style="float: left">{{ item.unitgroupname }}</p>
+                    <p style="float:right;color: #8492a6; font-size: 13px">{{ item.conversionrate }}{{item.unitname}}/{{item.auxunitname}},换算率:{{'1:'+ item.conversionrate}}</p>
+                  </el-option>
                 </el-select>
-              </el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="批次管理">
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.batchcontrol" @change="isauxunitChange">是否需要批次管理</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="单品管理">
-              <el-checkbox :true-label="1" :false-label="0" v-model="form.skucontrol" @change="isauxunitChange">是否需要单品管理</el-checkbox>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="毛重(g)">
-              <el-input v-model="form.grossweight" placeholder="输入产品毛重(g)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="	净重(g)">
-              <el-input v-model="form.weight" placeholder="输入产品净重(g)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="高度">
-              <el-input v-model="form.height" placeholder="输入产品高度(mm)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="宽度">
-              <el-input v-model="form.width" placeholder="输入产品宽度(mm)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="长度">
-              <el-input v-model="form.length" placeholder="输入产品长度(mm)"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="条形码">
-              <el-input v-model="form.barcode" placeholder="输入条形码"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input v-model="form.remarks" type="textarea" placeholder="输入产品备注"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="20">
-            <el-form-item  label="产品图">
-              <div class="flex-align-center" style="flex-wrap:wrap">
-                <uploadFile
-                    style="margin:10px 10px 10px 0;"
-                    ref="upload"
-                    :folderid="folderid"
-                    accept=".JPG,.PNG,.jpg,.png"
-                    btntype="image"
-                    :bindData="{ownertable:'plm_item',ownerid:form.itemid,usetype:'default'}"
-                    @onSuccess="uploadSuccess">
-                </uploadFile>
-                <previewImage style="margin-right: 10px;margin-bottom:10px" v-for="image in form.attinfos" :key="image.index" :image="image"  :deletebtn="true"
-                            @onSuccess="clearCover"></previewImage>
-              </div>
-              <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
-            </el-form-item>
-          </el-col>
-        </el-form>
-      </el-row>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="9">
+              <el-form-item label="换算率">
+                <el-input v-model="form.itemname" readonly></el-input>
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="12">
+              <el-form-item label="起订量" prop="orderminqty">
+                <el-input placeholder="起订量" v-model="form.orderminqty" class="input-with-select">
+                  <el-select style="width:100px" v-model="form.orderminqty_auxunit" slot="prepend" placeholder="请选择">
+                    <el-option label="主单位" :value="0"></el-option>
+                    <el-option :disabled="form.isauxunit === 0" label="辅助单位" :value="1"></el-option>
+                  </el-select>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="增量" prop="orderaddqty">
+                <el-input placeholder="增量" v-model="form.orderaddqty" class="input-with-select">
+                  <el-select style="width:100px" v-model="form.orderaddqty_auxunit" slot="prepend" placeholder="请选择">
+                    <el-option label="主单位" :value="0"></el-option>
+                    <el-option :disabled="form.isauxunit === 0" label="辅助单位" :value="1"></el-option>
+                  </el-select>
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="批次管理">
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.batchcontrol" @change="isauxunitChange">是否需要批次管理</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="单品管理">
+                <el-checkbox :true-label="1" :false-label="0" v-model="form.skucontrol" @change="isauxunitChange">是否需要单品管理</el-checkbox>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="毛重(g)">
+                <el-input v-model="form.grossweight" placeholder="输入产品毛重(g)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="	净重(g)">
+                <el-input v-model="form.weight" placeholder="输入产品净重(g)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="高度">
+                <el-input v-model="form.height" placeholder="输入产品高度(mm)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="宽度">
+                <el-input v-model="form.width" placeholder="输入产品宽度(mm)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="长度">
+                <el-input v-model="form.length" placeholder="输入产品长度(mm)"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="条形码">
+                <el-input v-model="form.barcode" placeholder="输入条形码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="交期">
+                <el-input v-model="form.delivery" placeholder="输入交期"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注">
+                <el-input v-model="form.remarks" type="textarea" placeholder="输入产品备注"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item  label="产品图">
+                <div class="flex-align-center" style="flex-wrap:wrap">
+                  <uploadFile
+                      style="margin:10px 10px 10px 0;"
+                      ref="upload"
+                      :folderid="folderid"
+                      accept=".JPG,.PNG,.jpg,.png"
+                      btntype="image"
+                      :bindData="{ownertable:'plm_item',ownerid:form.itemid,usetype:'default'}"
+                      @onSuccess="uploadSuccess">
+                  </uploadFile>
+                  <previewImage style="margin-right: 10px;margin-bottom:10px" v-for="image in form.attinfos" :key="image.index" :image="image"  :deletebtn="true"
+                              @onSuccess="clearCover"></previewImage>
+                </div>
+                <small style="display:block;margin-top:20px" class="info">注：建议上传图片大小1024x1024，大小不超过2M，格式为JPG/PNG</small>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width">保 存</el-button>

src/HDrpManagement/publicCustomer/index.vue

@@ -12,18 +12,10 @@
       }"
       >
       <template #titleRight>
-<!--        <el-divider direction="vertical"></el-divider>
-        <el-dropdown size="medium" @command="handleCommand">
-          <span class="el-dropdown-link">
-            {{poolValue}}<i class="el-icon-arrow-down el-icon&#45;&#45;right"></i>
-          </span>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item v-for="(item,index) in poolList" :key="index" :command="item">{{item.poolname}}</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>-->
       </template>
       <template #custom>
-        <label class="search__label" style="width: 50px">公海池:</label>
+      <div>
+        <label class="search__label">公海池:</label>
         <el-select class="inline-16" v-model="selectParam.sa_customerpoolid" size="small" placeholder="请选择公海池" @change="selectChange" clearable>
           <el-option
               v-for="item in option.poolList"
@@ -32,7 +24,9 @@
               :value="item.sa_customerpoolid">
           </el-option>
         </el-select>
-        <label class="search__label" style="width: 60px">客户类型:</label>
+      </div>
+      <div>
+        <label class="search__label">客户类型:</label>
         <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
               v-for="item in option.typeData"
@@ -41,7 +35,9 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label class="search__label" style="width: 60px">客户等级:</label>
+      </div>
+      <div>
+        <label class="search__label">客户等级:</label>
         <el-select class="inline-16" v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
               v-for="item in option.gradeData"
@@ -50,7 +46,9 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label class="search__label" style="width: 60px">客户行业:</label>
+      </div>
+      <div>
+        <label class="search__label">客户行业:</label>
         <el-select class="inline-16" v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
               v-for="item in option.industryData"
@@ -59,7 +57,9 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label class="search__label" style="width: 60px">客户状态:</label>
+      </div>
+      <div>
+        <label class="search__label">客户状态:</label>
         <el-select class="inline-16" v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
           <el-option
               v-for="item in option.status"
@@ -68,7 +68,9 @@
               :value="item.value">
           </el-option>
         </el-select>
-        <label class="search__label" style="width: 65px;">创建时间:</label>
+      </div>
+      <div>
+        <label class="search__label">创建时间:</label>
         <el-date-picker
             style="margin-right: 24px !important;"
             size="small"
@@ -81,22 +83,9 @@
             end-placeholder="结束日期"
             clearable>
         </el-date-picker>
+      </div>
       </template>
       <template v-slot:tbList="scope">
-<!--        <div v-if="scope.data.column.columnname == 'leader'">-->
-<!--          {{scope.data.column.data[[scope.data.column.columnname]].length > 0 ? scope.data.column.data[[scope.data.column.columnname]].name : '&#45;&#45;'}}-->
-<!--        </div>-->
-<!--        <div v-else-if="scope.data.column.columnname == 'grade' && customerLead">-->
-<!--          {{customerLead.find(item => item.rowindex == scope.data.column.data[scope.data.column.columnname]).value}}-->
-<!--        </div>-->
-<!--        <div v-else-if="scope.data.column.columnname == 'datastatus'">-->
-<!--          <span :style="scope.data.column.data[scope.data.column.columnname] == 0 ? '正常' : scope.data.column.data[scope.data.column.columnname] == 1 ? 'color:#cccccc' : 'color:red'">-->
-<!--            {{scope.data.column.data[scope.data.column.columnname] == 0 ? '正常' : scope.data.column.data[scope.data.column.columnname] == 1 ? '作废' : '锁定'}}-->
-<!--          </span>-->
-<!--        </div>-->
-<!--        <div v-else>-->
-<!--          {{scope.data.column.data[scope.data.column.columnname] || scope.data.column.columnname == 'operation' ? scope.data.column.data[[scope.data.column.columnname]] : '&#45;&#45;'}}-->
-<!--        </div>-->
         <div v-if="scope.data.column.columnname === 'isleader'">
           <span v-if="scope.data.column.data['leader'].length !== 0">已分配</span>
           <span v-else>未分配</span>
@@ -104,18 +93,10 @@
         <div v-else-if="scope.data.column.columnname === 'contact'">
           <span>{{scope.data.column.data['leader'][0]?scope.data.column.data['leader'][0].name:''}}</span>
         </div>
-<!--        <div v-else-if="scope.data.column.columnname === 'grade'">
-          <p v-if="scope.data.column.data.grade === 2">B级</p>
-          <p v-if="scope.data.column.data.grade === 1">A级</p>
-          <p v-if="scope.data.column.data.grade === 3">C级</p>
-        </div>-->
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
         </div>
       </template>
-     <!-- <template v-slot:tbOpreation="scope">
-        <status-change class="inline-16" @deleteSuccess="$refs.basicLayout.listData()" :data="scope.data.data" />
-      </template> -->
     </basicLayout>
   </div>
 </template>
@@ -337,4 +318,7 @@ export default {
 .el-icon-arrow-down {
   font-size: 16px;
 }
+.s_panel{
+  margin-bottom: 10px;
+}
 </style>

src/HManagement/addressList/mygroup/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="container normal-panel normal-margin">
     <el-button type="primary" size="small" icon="el-icon-plus" @click="dialogFormVisible = true">新建群组</el-button>
-    <el-dialog title="新建群组" :visible.sync="dialogFormVisible" width="600px">
+    <el-dialog title="新建群组" append-to-body :visible.sync="dialogFormVisible" width="600px">
       <el-form :model="form" ref="form" label-position="right" label-width="80px" size="small">
         <el-form-item label="群组名称" prop="groupname" :rules="[
           { required: true, message: '群组名称不能为空'},

src/HManagement/addressList/mygroup/modules/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-button type="text" icon="el-icon-edit" size="small" class="inline-16" style="color:#333" @click="onShow()">编 辑</el-button>
-    <el-dialog title="编辑群组" :visible.sync="dialogFormVisible" width="600px">
+    <el-dialog title="编辑群组" append-to-body :visible.sync="dialogFormVisible" width="600px">
       <el-form :model="form" ref="form" label-position="right" label-width="80px" size="small">
         <el-form-item label="群组名称" prop="groupname" :rules="[
           { required: true, message: '群组名称不能为空'},

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

@@ -50,7 +50,7 @@
           <span style="color:red">{{scope.column.data[scope.column.columnname]}}</span>
         </div>
         <span v-else>{{scope.column.data[scope.column.columnname]}}</span>
-        <span v-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation'">--</span>
+        <span v-if="!scope.column.data[scope.column.columnname] && scope.column.columnname != 'operation' && scope.column.columnname != 'errmsg'">--</span>
       </template>
       <template v-slot:opreation="scope">
         <body-edit 

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

@@ -43,7 +43,7 @@
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:">
+            <el-form-item label="部门:" prop="depname">
               <el-popover
                 placement="bottom"
                 width="400"
@@ -112,6 +112,11 @@ export default {
       sys_options:'sys_options'
     })
   },
+  watch: {
+    dialogFormVisible(val) {
+      !val && this.$refs.form.resetFields()
+    }
+  },
   data () {
     return {
       dialogFormVisible:false,
@@ -123,6 +128,9 @@ export default {
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
+        depname: [
+          { required: true, message: '请选择部门', trigger: 'change' },
+        ],
         phonenumber: [
           { required: true, message: '请输入员工电话', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }

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

@@ -43,7 +43,7 @@
             </el-form-item>
           </el-col>
           <el-col class="mb-30" :span="12">
-            <el-form-item label="部门:">
+            <el-form-item label="部门:" prop="depname">
               <el-popover
                 placement="bottom"
                 width="400"
@@ -121,6 +121,9 @@ export default {
         name: [
           { required: true, message: '请输入员工姓名', trigger: 'blur' },
         ],
+        depname: [
+          { required: true, message: '请选择部门', trigger: 'change' },
+        ],
         phonenumber: [
           { required: true, message: '请输入员工电话', trigger: 'blur' },
           { pattern:/^1[3-9]\d{9}$/, message: '请输入正确手机号码',trigger: 'blur' }

src/HManagement/notice/index.vue

@@ -7,6 +7,7 @@
       idName="sat_noticeid"
       :apiId="{query:20221101094903,del:20221101095103}"
       :options="options"
+      @listData="list"
       >
     >
     <div slot="titleRight">
@@ -137,6 +138,24 @@ export default {
     this.getAccountType()
   },
   methods:{
+    /* 删除新建产生的无效通告 */
+    async list (data) {
+      let initID = '9999' + JSON.parse(window.sessionStorage.getItem("active_account")).userid;
+      let deleteList = [];
+      data.forEach(v => (initID == v.sat_notice_classid && v.title == '') ? deleteList.push(v.sat_noticeid) : '');
+      if (deleteList.length != 0) this.handleDelete(deleteList);
+    },
+    /* 处理批量删除 */
+    handleDelete(list) {
+      this.$api.requested({
+        "id":20221101095103,
+        "content": {
+          "sat_noticeids": list
+        }
+      }).then(res => {
+        if (res.msg == '成功') this.$refs.list.listData();
+      })
+    },
     closeDrawer () {
       this.$store.dispatch('DrawerShowChange',false)
       this.$router.push({path:"notice_mag_list"})

src/HManagement/notice/list/modules/add.vue

@@ -15,7 +15,7 @@ export default {
       folderid:JSON.parse(sessionStorage.getItem('folderid')).appfolderid,
       form:{
         "sat_noticeid":0,
-        "sat_notice_classid": 0,
+        "sat_notice_classid": '9999' + JSON.parse(sessionStorage.getItem('active_account')).userid,
         "title": "",
         "summary": "",
         "content": "",

src/HManagement/roleManage/modules/edit.vue

@@ -33,7 +33,7 @@
         </div>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -67,6 +67,7 @@ export default {
       },
     }
   },
+  props:['data'],
   components:{
     roleContentTemp
   },
@@ -76,6 +77,7 @@ export default {
   methods:{
     editBtn () {
       this.drawer = true
+      this.form = Object.assign({},this.form,this.data)
     },
     onSuccess () {
       this.drawer = false

src/HManagement/siteManage/custom_option/modules/add.vue

@@ -8,9 +8,9 @@
       </div>
       <div>
         <el-row :gutter="20">
-          <el-form :model="form"   ref="form"  size="mini" label-position="right" label-width="90px">
+          <el-form :model="form"   ref="form" :rules="rules"  size="mini" label-position="right" label-width="90px">
             <el-col :span="20">
-              <el-form-item  label="分类名称:">
+              <el-form-item  label="分类名称:" prop="value">
                 <el-input type="textarea" autosize v-model="form.value" placeholder="输入分类名称"></el-input>
               </el-form-item>
             </el-col>
@@ -43,6 +43,11 @@ export default {
         "value":"",
         "remarks":"",
         "sequence":2
+      },
+      rules:{
+        value:[
+          { required: true, message: '请输入标签名', trigger: 'blur'},
+        ],
       }
     }
   },

src/HManagement/siteManage/custom_option/modules/edit.vue

@@ -8,9 +8,9 @@
       </div>
       <div>
         <el-row :gutter="20">
-          <el-form :model="form"   ref="form"  size="mini" label-position="right" label-width="90px">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="90px">
             <el-col :span="20">
-              <el-form-item  label="分类名称:">
+              <el-form-item  label="分类名称:" prop="value">
                 <el-input type="textarea" autosize v-model="form.value" placeholder="输入分类名称"></el-input>
               </el-form-item>
             </el-col>
@@ -45,6 +45,11 @@ export default {
         value:'',
         remarks:'',
         sequence:2
+      },
+      rules:{
+        value:[
+          { required: true, message: '请输入标签名', trigger: 'blur'},
+        ],
       }
     }
   },

src/HManagement/siteManage/tagManage/components/edit.vue

@@ -51,7 +51,8 @@ export default {
         tag:'',
         result:'',
         helptips:'',
-        sys_systemtagid:0,
+        sys_systemtagid:'',
+        sys_systemtagdetailid:''
       },
       result:[],
       rules:{

src/HManagement/siteManage/tagManage/index.vue

@@ -5,8 +5,8 @@
       ref="basicLayout" 
       formPath="tagManage" 
       tableName="dataTagDetailTable" 
-      idName="sys_systemtagid" 
-      :apiId="{query:20221013104401,del:''}" 
+      idName="sys_systemtagdetailid" 
+      :apiId="{query:20221013104401,del:20221013104601}" 
       :options="options"
       @listCreate="list"
       @listData="listData"
@@ -41,6 +41,7 @@
         <div v-else>{{scope.data.column.data[scope.data.column.columnname]}}</div>
       </template>
       <template v-slot:tbOpreation="scope">
+        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" @onSuccess="$refs.list.listData()" :data="scope.data.data"/>
         <mutextage 
           class="inline-16" 
           :tagData="selectTarget" 
@@ -83,10 +84,9 @@ export default {
   methods:{
     async deleteRow (data) {
       let res = await this.$api.requested({
-        "id": 20221013104601,
+        "id":20221013104601,
         "content": {
-          "sys_systemtagid": this.selectTarget,
-          "tags":[data.tag]
+          "sys_systemtagdetailids": [data.sys_systemtagdetailid],
         }
       })
       console.log(res);
@@ -96,6 +96,8 @@ export default {
     },
     listData (data) {
       this.allData = data
+      console.log(data);
+      
     },
     list (param) {
       param.content.sys_systemtagid = this.objectList[0].sys_systemtagid

src/SDrpManagement/salerPrivatecustomer/index.vue

@@ -43,77 +43,75 @@
         </el-select>
       </template> -->
       <template #custom>
-        <div class="flex-align-center">
-          <div>
-            <label class="search__label">范围:</label>
-            <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" clearable>
-              <el-option
-                v-for="item in editableTabs"
-                :key="item.index"
-                :label="item.title"
-                :value="item.name">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-            <label class="search__label">客户类型:</label>
-            <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
-              <el-option
-                  v-for="item in option.typeData"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-            <label class="search__label">客户等级:</label>
-            <el-select v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
-              <el-option
-                  v-for="item in option.gradeData"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-            <label class="search__label">所属行业:</label>
-            <el-select v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
-              <el-option
-                  v-for="item in option.industryData"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-             <label class="search__label">合作状态:</label>
-            <el-select v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
-              <el-option
-                  v-for="item in option.status"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div>
-            <label class="search__label" >创建时间:</label>
-            <el-date-picker
-                style="margin-right: 24px !important;"
-                size="small"
-                @change="selectChange"
-                value-format="yyyy-MM-dd"
-                v-model="dateSelect"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                clearable>
-            </el-date-picker>
-          </div>
+        <div>
+          <label class="search__label">范围:</label>
+          <el-select class="inline-16" v-model="value" size="small" placeholder="请选择数据分类" @change="selectChange" clearable>
+            <el-option
+              v-for="item in editableTabs"
+              :key="item.index"
+              :label="item.title"
+              :value="item.name">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          <label class="search__label">客户类型:</label>
+          <el-select class="inline-16" v-model="selectParam.type" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.typeData"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          <label class="search__label">客户等级:</label>
+          <el-select v-model="selectParam.customergrade" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.gradeData"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          <label class="search__label">所属行业:</label>
+          <el-select v-model="selectParam.industry" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.industryData"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+            <label class="search__label">合作状态:</label>
+          <el-select v-model="selectParam.status" size="small" placeholder="请选择" @change="selectChange" clearable>
+            <el-option
+                v-for="item in option.status"
+                :key="item.value"
+                :label="item.value"
+                :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div>
+          <label class="search__label" >创建时间:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
         </div>
       </template>
       <template v-slot:tbList="scope">
@@ -298,4 +296,7 @@ export default {
 .el-icon-arrow-down {
   font-size: 16px;
 }
+.s_panel {
+  margin-bottom:10px
+}
 </style>

src/assets/icons/tag.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1668824766721" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6541" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M110.933333 0C51.2 0 0 51.2 0 110.933333v256c0 68.266667 34.133333 136.533333 76.8 187.733334L512 989.866667c42.666667 42.666667 110.933333 42.666667 153.6 0l324.266667-324.266667c42.666667-42.666667 42.666667-110.933333 0-153.6L554.666667 76.8C503.466667 34.133333 435.2 0 366.933333 0h-256zM256 366.933333c-59.733333 0-110.933333-51.2-110.933333-110.933333S196.266667 145.066667 256 145.066667s110.933333 51.2 110.933333 110.933333c0 59.733333-51.2 110.933333-110.933333 110.933333z" fill="#8a8a8a" p-id="6542"></path></svg>

src/components/newLayout/modules/header.vue

@@ -95,9 +95,9 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        this.$router.push('/')
         sessionStorage.clear()
-        // location.reload(true);
+        this.$router.push('/')
+        location.reload(true);
       }).catch((err) => {
         console.log(err)
         this.$message({

src/components/normal-basic-layout/details/index.vue

@@ -12,7 +12,7 @@
           <div>
             <slot name="customOperation"></slot>
           </div>
-          <div>
+          <div v-if="noPageChange === true">
             <el-button :disabled="rowindex === 1" size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
             <el-button :disabled="rowindex === total" size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
           </div>
@@ -34,7 +34,7 @@
           </tabTemp>
           <slot name="custom"></slot>
         </el-col>
-        <el-col style="width:400px;flex:1" :span="6">
+        <el-col style="width:400px;flex:1 0 auto" :span="6">
           <group v-if="acitveApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
           <follow-up v-if="acitveApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
         </el-col>
@@ -54,7 +54,7 @@ import tabTemp from './modules/tabs/tab.vue'
 import group from './modules/group/group.vue'
 import {mapGetters} from 'vuex'
 export default {
-  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck'],
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','noPageChange'],
   data () {
     return {
       routerName:'',

src/components/normal-basic-layout/details/modules/tags/tag.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
     <!-- <p class="detail__head__label">标签展示:</p> -->
-    <div v-if="showTag">
+    <div v-if="showTag" class="flex-align-center">
       <el-tag style="margin-right:10px" color="#FA8C16" v-for="item in systemtag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
       <el-tag style="margin-right:10px" color="#FAAB16" v-for="item in datatag" :key="item.rowindex" size="small" type="warning" effect="dark">{{item}}</el-tag>
-      <el-button type="text" @click="showTag = false">+</el-button>
+      <!-- <el-button type="text" @click="showTag = false">+</el-button> -->
+      <img src="@/assets/icons/tag.svg" @click="showTag = false" height="20" alt="">
     </div>
     <el-select
       v-else
-      style="width:50%;"
+      style="width:30%;"
       v-model="datatag"
       multiple
       placeholder="请选择文章标签"
@@ -22,6 +23,8 @@
         :value="item.tag"
         @click.native="setMutextag(item)"
         :disabled="hasDisabledTag(item)">
+        <span style="float: left">{{ item.tag }}</span>
+        <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>
       </el-option>
     </el-select>
   </div>
@@ -52,9 +55,7 @@ export default {
       this.option = res.data.option
       this.datatag = res.data.datatag
       this.systemtag = res.data.systemtag
-      this.datatag.length > 0?this.option.forEach(e=>{
-        this.setMutextag(e)
-      }):''
+      this.datatag.length > 0?this.setMutextag():''
     },
     async addTag (val) {
       if (val === false) {
@@ -71,18 +72,29 @@ export default {
       }
     },
     setMutextag (item) {
-       let _isSame = this.datatag.some(tag=>item.tag === tag)
-       if (_isSame) {
-          this.mutextag = this.mutextag.concat(item.mutextag)
-       } else {
-        let a = new Set(this.mutextag);
-        let b = new Set(item.mutextag); 
-        this.mutextag = Array.from(new Set([...a].filter(x => !b.has(x))))
-       }
+      //  let _isSame = this.datatag.some(tag=>item.tag === tag)
+      //  if (_isSame) {
+      //     this.mutextag = this.mutextag.concat(item.mutextag)
+      //  } else {
+      //   let a = new Set(this.mutextag);
+      //   let b = new Set(item.mutextag); 
+      //   this.mutextag = Array.from(new Set([...a].filter(x => !b.has(x))))
+      //  }
+      // var arr = this.option.filter(item=>{
+      //     return this.datatag.includes(item.tag)
+      // })
     },
     hasDisabledTag (item) {
-      let arr = this.datatag.length === 0?[]:this.mutextag
-      let _isSame = arr.some(tag=>item.tag === tag)
+      let arr = []
+      let arr2 = []
+      arr = this.option.filter(item=>{
+        return this.datatag.includes(item.tag)
+      })
+      arr.forEach(e=>{
+        arr2 = arr2.concat(e.mutextag)
+      })
+      arr2 = this.datatag.length === 0?[]:arr2
+      let _isSame = arr2.some(tag=>item.tag === tag)
       return _isSame
     }
   },

src/components/normal-basic-layout/drawerDetail/drawer.vue

@@ -0,0 +1,49 @@
+<template>
+  <el-drawer
+    title="我是标题"
+    :visible.sync="closeDrawerTemp"
+    :with-header="false"
+    direction="rtl"
+    size="90%"
+    @close="closeDrawer"
+    append-to-body>
+    <div class="detail__panel">
+      <router-view v-if="closeDrawerTemp"/>
+    </div>
+  </el-drawer>
+</template>
+
+<script>
+import  {mapGetters} from 'vuex'
+
+export default {
+  computed:{
+    ...mapGetters({
+      closeDrawerTemp:'closeDrawerTemp'
+    })
+	},
+  data () {
+    return {
+    }
+  },
+  methods:{
+    closeDrawer () {
+      this.$store.dispatch('changeDetailDrawer',false)
+      this.$emit('onSuccess')
+      this.$router.go(-1)
+    }
+  }
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.detail__panel{
+  background:#f1f2f3;
+  overflow-y: scroll;
+  font-size: 14px;
+  color:#666;
+  height:100vh;
+}
+</style>

src/components/normal-basic-layout/drawerDetail/index.vue

@@ -42,6 +42,7 @@ export default {
       }
       let query = {id:this.data[key],rowindex:this.data.rowindex}
       this.$router.push({path:this.detailPath.path,query:Object.assign({},query,this.detailPath.param)})
+      this.$store.dispatch('changeDetailDrawer',true)
     },
     closeDrawer () {
       this.$router.go(-1)

src/components/normal-basic-layout/index.vue

@@ -28,17 +28,10 @@
             <i class="el-icon-refresh" @click="listData(param.content.pageNumber = 1,param.content.where.condition = '')"></i>
           </div>
         </div>
-        <div class="flex-align-center">
-          <!-- <el-radio-group v-if="options" class="inline-16" v-model="listType" size="small">
-            <el-radio-button label="table" ><i class="el-icon-tickets"></i></el-radio-button>
-            <el-radio-button label="card"><i class="el-icon-menu"></i></el-radio-button>
-          </el-radio-group> -->
+        <div class="flex-align-center" style="min-width:800px">
           <slot name="custom"></slot>
-          <div>
-            <!-- <label for="">搜索:&nbsp;</label> -->
-            <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" style="width:200px" size="small" class="input-with-select inline-16" clearable>
-            </el-input>
-          </div>
+          <el-input style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
+          </el-input>
         </div>
       </div>
       <div class="normal-panel flex-align-center" style="padding:0 16px">
@@ -74,6 +67,7 @@
         </div>
       </div>
     </div>
+    <drawer></drawer>
   </div>
 </template>
 
@@ -89,7 +83,9 @@ export default {
     setFixed: () => import('./modules/setFixed'),
     drawerTemp:() =>  import('./drawerDetail/index'),
     excel:() =>  import('@/components/export_excel/index.vue'),
-    cardTemp:() => import('./modules/cardList.vue')
+    cardTemp:() => import('./modules/cardList.vue'),
+    drawer:() =>  import('./drawerDetail/drawer'),
+
   },
   computed:{
     ...mapGetters({

src/components/normal-basic-layout/normal.vue

@@ -23,14 +23,6 @@ import {mapGetters} from 'vuex'
 export default {
   props:['tableName','idName','tableData','apiId','formPath','oldFormPath','options','autoQuery','detailPath','customTitle','hidePagination'],
   components:{
-    tableTemp: () => import('./modules/table.vue'),
-    setColumn: () => import('./modules/setColumn.vue'),
-    cpAdd: () => import('./modules/cpAdd'),
-    cpEdit: () => import('./modules/cpEdit'),
-    setFixed: () => import('./modules/setFixed'),
-    drawerTemp:() =>  import('./drawerDetail/index'),
-    excel:() =>  import('@/components/export_excel/index.vue'),
-    cardTemp:() => import('./modules/cardList.vue')
   },
   computed:{
     ...mapGetters({
@@ -41,31 +33,7 @@ export default {
   },
   data () {
     return {
-      listType:'table',
-      routerName:'',
-      select:'',
-      param:{
-        content:{
-          "isExport":0,
-          "pageNumber": 1,
-          "pageSize": 20,
-          "where": {
-            "condition": "",
-            "tablefilter":{}
-          }
-        }
-      },
-      layout:[],
-      fixRightData:['operation'],
-      fixLeftData:[],
-      tableLayout:[],
-      selection:[],
-      list:[],
-      total:0,
-      currentPage:0,
-      refreshTable:true,
-      title:'',
-      name:''
+     
     }
   },
   methods:{

src/components/previewImage/index.vue

@@ -3,8 +3,9 @@
     <el-image 
       v-if="image.url"
       ref="preview"
-      style="width: 100%;"
-      :src="image.url" 
+      style="width: 100%;height:100%"
+      :src="image.url"
+      fit="cover"
       :preview-src-list="srcList">
     </el-image>
     <div class="mode flex-align-center flex-around">

src/components/upload/preview_upload.vue

@@ -31,6 +31,7 @@
         action="#"
         :on-change="onChange"
         :show-file-list="false"
+        list-type="picture-card"
         :auto-upload="false"
         multiple>
         <i class="el-icon-plus"></i>

src/store/index.js

@@ -89,6 +89,7 @@ export default new Vuex.Store({
       state.menuApp = data
     },
     changeDetailDrawer (state,bool) {
+      console.log(bool)
       state.closeDrawerTemp = bool
     },
     DrawerShowChange (state,bool) {

src/style/style.css

@@ -41,6 +41,7 @@ ul{
 }
 .flex-align-center{
   display: flex;
+  flex-wrap: wrap;
   align-items: center;
 }
 .flex-align-stretch{
@@ -204,7 +205,8 @@ ul{
 }
 .search__label{
   display: inline-block;
-  width: 70px;
+  width: 80px;
+  margin-right:10px;
   text-align: right;
   font-size: 14px;
   color:rgb(163, 163, 163) !important;

src/utils/tool.js

@@ -39,7 +39,7 @@ export default {
     })
     // 获取当前应用表格数据
     let tablecols = active_modules[0].meta.tables
-
+    console.log(tablecols,'tablecols')
     return tablecols
   },