公告修改

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_09k3sy1cwrk.css');
+@import url('//at.alicdn.com/t/font_2077629_madzhlq9km.css');
 
 html,
 body,

src/components/system/dept-form.vue

@@ -36,6 +36,9 @@
             class="col-6 q-pr-lg q-pb-lg" label="部门电话" />
           <q-input filled stack-label maxlength="50" :dense="false" v-model="objOption.DeptSort" ref="DeptSort"
             class="col-6 q-pr-lg q-pb-lg" label="排序" />
+          <q-select filled stack-label option-value="value" option-label="label" v-model="objOption.IsCompany "
+                    ref="DeptTier" :options="IsCompanyL" label="是否校区" :dense="false" class="col-6 q-pr-lg q-pb-lg" emit-value
+                    map-options  />
           <div class="col-6 q-pr-lg q-pb-lg q-pt-lg">
             <q-toggle size="md" label="状态" color="primary" :false-value="1" :true-value="0"
               v-model="objOption.Status" />
@@ -95,6 +98,7 @@
           School_Id: 0, //校区编号
           DeptTier: 0, //部门层级
           DeptSort: 0, //部门排序
+          IsCompany:0,//是否校区1是  0否
         },
         optionTitle: "",
         returnString: [], //部门树默认值
@@ -105,6 +109,10 @@
         DeptTierList: [], //部门层级列表
         schoolList: [], //校区列表
         tempManager: [], //负责人编号数组
+        IsCompanyL:[
+          {label:'是',value:1},
+          {label:'否',value:0},
+        ]
       }
     },
     created() {

src/pages/system/document.vue

@@ -54,31 +54,17 @@
           </template>
           <template v-slot:body-cell-optioned="props">
             <q-td :props="props">
-              <i class="iconfont icon-zhiding" style="margin-left: 5px;font-size: 20px"   @click="setNoticeOtion(props.row.Id,1)" v-if="props.row.NoticeState==1&&props.row.Is_Top==2">
-                <q-tooltip>
-                  置顶
-                </q-tooltip>
-              </i>
-              <i class="iconfont icon-quxiaozhiding" style="margin-left: 5px;font-size: 20px"  @click="setNoticeOtion(props.row.Id,2)" v-if="props.row.NoticeState==1&&props.row.Is_Top==1">
-                <q-tooltip>
-                  取消置顶
-                </q-tooltip>
-              </i>
-              <i class="iconfont icon-xiangqing" style="margin-left: 5px;font-size: 20px"  @click="EditConfig(props.row.Id)" >
-                <q-tooltip>
-                  详情
-                </q-tooltip>
-              </i>
-              <i class="iconfont icon-chehui" style="margin-left: 5px;font-size: 20px"  @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1"  >
-                <q-tooltip>
-                  撤回
-                </q-tooltip>
-              </i>
-              <i class="iconfont icon-bianji-smal" style="margin-left: 5px;font-size: 20px"  v-if="props.row.NoticeState!=1"  @click="addDoc(props.row.Id)"  >
-                <q-tooltip>
-                  修改
-                </q-tooltip>
-              </i>
+              <q-btn flat size="xs" icon="iconfont icon-ziyuan" color="warning" style="font-weight:400" class="q-mr-xs"
+                     label="置顶" @click="setNoticeOtion(props.row.Id,1)" v-if="props.row.NoticeState==1&&props.row.Is_Top==2" />
+              <q-btn flat size="xs" icon="iconfont icon-ziyuan" color="warning" style="font-weight:400" class="q-mr-xs"
+                     label="取消置顶" @click="setNoticeOtion(props.row.Id,2)" v-if="props.row.NoticeState==1&&props.row.Is_Top==1" />
+              <q-btn flat size="xs" icon="iconfont icon-xiangqing-" color="primary" style="font-weight:400" class="q-mr-xs"
+                     label="详情" @click="EditConfig(props.row.Id)" />
+              <q-btn flat size="xs" icon="iconfont icon-chehui4" color="deep-orange" style="font-weight:400" class="q-mr-xs"
+                     label="撤回" @click="setNoticeOtion(props.row.Id,3)" v-if="props.row.NoticeState==1"  />
+              <q-btn flat size="xs" icon="iconfont icon-xiugai1" color="secondary" style="font-weight:400" class="q-mr-xs"
+                     label="修改" v-if="props.row.NoticeState!=1"  @click="addDoc(props.row.Id)"  />
+
             </q-td>
           </template>
           <template v-slot:bottom>
@@ -139,7 +125,7 @@
         <div class="text-caption q-mb-lg q-px-md text-grey-6">基本资料</div>
         <q-card-section class="q-pt-none">
           <div class="row wrap">
-            <q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源（FR）" />
+            <q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.From" label="公文来源（FR）" :rules="[val => !!val || '公文来源（FR）']"/>
 <!--            <selectTree class="col-6 q-pb-lg q-pr-lg" :treeData='DeptList' :defaultArray="returnString" nodeKey="DeptId" :multiple="true"-->
 <!--                        labelKey="DeptName" childrenKey="ChildList" tipText="To" @getChild="getChild"-->
 <!--                        classStr="col-6 q-pr-lg q-pb-lg"></selectTree>-->
@@ -182,7 +168,7 @@
               </template>
             </q-select>
             <q-input clearable class="col-6 q-pb-lg q-pr-lg" standout="bg-primary text-white" disable hint="Disable" v-model="nNumber" label="编号" v-if="nNumber!=null  "/>
-            <q-input clearable class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.Title" label="标题" />
+            <q-input clearable class="col-12 q-pb-lg q-pr-lg" standout="bg-primary text-white" v-model="addMsg.Title" label="标题" :rules="[val => !!val || '标题']"/>
             <div class="text-caption q-my-md q-px-xs text-grey-6">公告内容</div>
             <ext-editor :defaultMsg="addMsg.Content" classStr="col-12" @getEditValue="getEditValue"></ext-editor>
             <el-upload
@@ -486,6 +472,11 @@
           this.loading = false;
           getNoticeStateEnumList({Name:'',Id:''}).then(res => {
            this.NoticeList =  res.Data
+            let obj={
+              Name:'不限',
+              Id:0
+            }
+            this.NoticeList.unshift(obj)
           }).catch(() => {
             this.loading = false
           })
@@ -509,6 +500,11 @@
           }
           queryEmployee(qMsg).then(res => {
             if (res.Code == 1) {
+              let obj={
+                EmployeeName:'不限',
+                Id:0
+              }
+              res.Data.unshift(obj)
               var jsonData = res.Data;
               if (jsonData && jsonData.length > 0) {
                 this.AllemployeeList = JSON.parse(JSON.stringify(jsonData));