소스 검색

标签库,视频打标签

zhuxinbo 4 년 전
부모
커밋
ef06808e3a

+ 0 - 1
package.json

@@ -29,7 +29,6 @@
     "element-ui": "^2.13.0",
     "enquire.js": "^2.1.6",
     "html2canvas": "^1.0.0-rc.3",
-    "iview": "2.0.0-rc.17",
     "jquery": "^3.4.1",
     "js-cookie": "^2.2.0",
     "k-form-design": "^3.6.1",

+ 3 - 4
src/main.js

@@ -62,9 +62,9 @@ import JeecgComponents from '@/components/jeecg/index'
 // import iView from 'iview'
 import '!style-loader!css-loader!less-loader!./theme/index.less'
 
-// import ElementUI from 'element-ui';
-// import 'element-ui/lib/theme-chalk/index.css';
-
+import ElementUI from 'element-ui';
+import 'element-ui/lib/theme-chalk/index.css';
+Vue.use(ElementUI);
 import {
   getDay,
   allWeeks
@@ -77,7 +77,6 @@ Vue.prototype.wps = WPS;
 
 Vue.prototype.$getDay = getDay
 Vue.prototype.allWeeks = allWeeks
-// Vue.use(ElementUI);
 
 Vue.config.productionTip = false
 // Vue.use(iView)

+ 153 - 150
src/views/modules/material/labelMaterial.vue

@@ -5,13 +5,14 @@
 
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-          <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
-          <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
-          <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
-          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+          <a-button @click="handleAdd(1)" type="primary">添加标签</a-button>
+          <a-button @click="handleAdd(2)" type="primary" style="margin-left: 14px">添加下级</a-button>
+          <!-- <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
+          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader"
+            :action="importExcelUrl" @change="handleImportExcel">
             <a-button type="primary" icon="import">导入</a-button>
-          </a-upload>
-          <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
+          </a-upload> -->
+          <!-- <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button> -->
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
@@ -21,25 +22,20 @@
               <a v-if="this.currSelected.title" style="margin-left: 10px" @click="onClearSelected">取消选择</a>
             </div>
           </a-alert>
-          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入部门名称"/>
+          <a-input-search @search="onSearch" style="width:100%;margin-top: 10px" placeholder="请输入标签名称" />
+          <!-- {{departValue}}
+          <el-cascader placeholder="试试搜索:指南" :options="departTree"
+            :props="{ multiple: true,value:'id',label:'tagName',emitPath:false}" filterable v-model="departValue">
+          </el-cascader> -->
           <!-- 树-->
           <a-col :md="10" :sm="24">
             <template>
               <a-dropdown :trigger="[this.dropTrigger]" @visibleChange="dropStatus">
-               <span>
-            <a-tree
-              checkable
-              multiple
-              @select="onSelect"
-              @check="onCheck"
-              @rightClick="rightHandle"
-              :selectedKeys="selectedKeys"
-              :checkedKeys="checkedKeys"
-              :treeData="departTree"
-              :checkStrictly="checkStrictly"
-              :expandedKeys="iExpandedKeys"
-              :autoExpandParent="autoExpandParent"
-              @expand="onExpand"/>
+                <span>
+                  <a-tree checkable multiple @select="onSelect" @check="onCheck" @rightClick="rightHandle"
+                    :selectedKeys="selectedKeys" :checkedKeys="checkedKeys" :treeData="departTree"
+                    :checkStrictly="checkStrictly" :expandedKeys="iExpandedKeys" :autoExpandParent="autoExpandParent"
+                    @expand="onExpand" />
                 </span>
                 <!--新增右键点击事件,和增加添加和删除功能-->
                 <a-menu slot="overlay">
@@ -64,7 +60,8 @@
             <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
           </a-menu>
           <a-button>
-            树操作 <a-icon type="up" />
+            树操作
+            <a-icon type="up" />
           </a-button>
         </a-dropdown>
       </div>
@@ -72,76 +69,22 @@
     </a-col>
     <a-col :md="12" :sm="24">
       <a-tabs defaultActiveKey="1">
-        <a-tab-pane tab="基本信息" key="1" >
+        <a-tab-pane tab="基本信息" key="1">
           <a-card :bordered="false" v-if="selectedKeys.length>0">
             <a-form :form="form">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构名称">
-                <a-input placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签名称">
+                <a-input placeholder="请输入标签名称" v-decorator="['tagName', validatorRules.departName ]" />
               </a-form-item>
-              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级部门">
-                <a-tree-select
-                  style="width:100%"
-                  :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-                  :treeData="treeData"
-                  :disabled="disable"
-                  v-model="model.parentId"
-                  placeholder="无">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="上级标签">
+                <a-tree-select style="width:100%" :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
+                  :treeData="treeData" :disabled="disable" v-model="model.parentId" placeholder="无">
                 </a-tree-select>
               </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构编码">
-                <a-input disabled placeholder="请输入机构编码" v-decorator="['orgCode', validatorRules.orgCode ]"/>
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签描述">
+                <a-input placeholder="请输入标签描述" v-decorator="['description' ]" />
               </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="机构类型">
-                <template v-if="orgCategoryDisabled">
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                    <a-radio value="1">
-                      公司
-                    </a-radio>
-                  </a-radio-group>
-                </template>
-                <template v-else>
-                  <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-                    <a-radio value="2">
-                      部门
-                    </a-radio>
-                    <a-radio value="3">
-                      岗位
-                    </a-radio>
-                  </a-radio-group>
-                </template>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="排序">
-                <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="手机号">
-                <a-input placeholder="请输入手机号" v-decorator="['mobile', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="地址">
-                <a-input placeholder="请输入地址" v-decorator="['address', {'initialValue':''}]"/>
-              </a-form-item>
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="备注">
-                <a-textarea placeholder="请输入备注" v-decorator="['memo', {'initialValue':''}]"/>
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签编码">
+                <a-input disabled placeholder="请输入标签编码" v-decorator="['tagCode', validatorRules.orgCode ]" />
               </a-form-item>
             </a-form>
             <div class="anty-form-btn">
@@ -149,15 +92,12 @@
               <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">保存</a-button>
             </div>
           </a-card>
-          <a-card v-else >
+          <a-card v-else>
             <a-empty>
-              <span slot="description"> 请先选择一个部门! </span>
+              <span slot="description"> 请先选择一个标签! </span>
             </a-empty>
           </a-card>
         </a-tab-pane>
-        <a-tab-pane tab="部门权限" key="2" forceRender>
-          <depart-auth-modal ref="departAuth"/>
-        </a-tab-pane>
       </a-tabs>
 
     </a-col>
@@ -167,13 +107,21 @@
 <script>
   import DepartModal from './modules/DepartModal'
   import pick from 'lodash.pick'
-  import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
-  import {httpAction, deleteAction} from '@/api/manage'
-  import {JeecgListMixin} from '@/mixins/JeecgListMixin'
-  import DepartAuthModal from './modules/DepartAuthModal'
+  import {
+    queryDepartTreeList,
+    searchByKeywords,
+    deleteByDepartId
+  } from '@/api/api'
+  import {
+    httpAction,
+    deleteAction,
+    getAction
+  } from '@/api/manage'
+  import {
+    JeecgListMixin
+  } from '@/mixins/JeecgListMixin'
   // 表头
-  const columns = [
-    {
+  const columns = [{
       title: '机构名称',
       dataIndex: 'departName'
     },
@@ -207,18 +155,20 @@
       title: '操作',
       align: 'center',
       dataIndex: 'action',
-      scopedSlots: {customRender: 'action'}
+      scopedSlots: {
+        customRender: 'action'
+      }
     }
   ]
   export default {
     name: 'DepartList',
     mixins: [JeecgListMixin],
     components: {
-      DepartAuthModal,
       DepartModal
     },
     data() {
       return {
+        departValue: [],
         iExpandedKeys: [],
         loading: false,
         autoExpandParent: true,
@@ -241,36 +191,63 @@
         autoIncr: 1,
         currSelected: {},
 
-        allTreeKeys:[],
+        allTreeKeys: [],
         checkStrictly: true,
 
         form: this.$form.createForm(this),
         labelCol: {
-          xs: {span: 24},
-          sm: {span: 5}
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          }
         },
         wrapperCol: {
-          xs: {span: 24},
-          sm: {span: 16}
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 16
+          }
         },
         graphDatasource: {
           nodes: [],
           edges: []
         },
         validatorRules: {
-          departName: {rules: [{required: true, message: '请输入机构/部门名称!'}]},
-          orgCode: {rules: [{required: true, message: '请输入机构编码!'}]},
-          orgCategory: {rules: [{required: true, message: '请输入机构类型!'}]},
-          mobile: {rules: [{validator: this.validateMobile}]}
+          departName: {
+            rules: [{
+              required: true,
+              message: '请输入机构/部门名称!'
+            }]
+          },
+          orgCode: {
+            rules: [{
+              required: true,
+              message: '请输入机构编码!'
+            }]
+          },
+          orgCategory: {
+            rules: [{
+              required: true,
+              message: '请输入机构类型!'
+            }]
+          },
+          mobile: {
+            rules: [{
+              validator: this.validateMobile
+            }]
+          }
         },
         url: {
-          delete: '/sys/sysDepart/delete',
-          edit: '/sys/sysDepart/edit',
+          delete: '/ctop/tagInfo/edit',
+          edit: '/ctop/tagInfo/edit',
           deleteBatch: '/sys/sysDepart/deleteBatch',
           exportXlsUrl: "sys/sysDepart/exportXls",
           importExcelUrl: "sys/sysDepart/importExcel",
         },
-        orgCategoryDisabled:false,
+        orgCategoryDisabled: false,
       }
     },
     computed: {
@@ -286,7 +263,7 @@
         var that = this
         that.treeData = []
         that.departTree = []
-        queryDepartTreeList().then((res) => {
+        getAction('/ctop/tagInfo/queryTreeList').then((res) => {
           if (res.success) {
             //部门全选后,再添加部门,选中数量增多
             this.allTreeKeys = [];
@@ -297,6 +274,7 @@
               that.setThisExpandedKeys(temp)
               that.getAllKeys(temp);
               // console.log(temp.id)
+
             }
             this.loading = false
           }
@@ -358,7 +336,9 @@
             title: '确认删除',
             content: '确定要删除所选中的 ' + this.checkedKeys.length + ' 条数据,以及子节点数据吗?',
             onOk: function () {
-              deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
+              deleteAction(that.url.deleteBatch, {
+                ids: ids
+              }).then((res) => {
                 if (res.success) {
                   that.$message.success(res.message)
                   that.loadTree()
@@ -374,7 +354,9 @@
       onSearch(value) {
         let that = this
         if (value) {
-          searchByKeywords({keyWord: value}).then((res) => {
+          searchByKeywords({
+            keyWord: value
+          }).then((res) => {
             if (res.success) {
               that.departTree = []
               for (let i = 0; i < res.result.length; i++) {
@@ -393,8 +375,7 @@
       nodeModalOk() {
         this.loadTree()
       },
-      nodeModalClose() {
-      },
+      nodeModalClose() {},
       hide() {
         console.log(111)
         this.visible = false
@@ -404,9 +385,9 @@
         this.hiding = false
         //this.checkedKeys = checkedKeys.checked
         // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-        if(this.checkStrictly){
+        if (this.checkStrictly) {
           this.checkedKeys = checkedKeys.checked;
-        }else{
+        } else {
           this.checkedKeys = checkedKeys
         }
         // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
@@ -421,19 +402,25 @@
         this.selectedKeys = [record.key]
         this.model.parentId = record.parentId
         this.setValuesToForm(record)
-        this.$refs.departAuth.show(record.id);
 
       },
       // 触发onSelect事件时,为部门树右侧的form表单赋值
       setValuesToForm(record) {
-        if(record.orgCategory == '1'){
-          this.orgCategoryDisabled = true;
-        }else{
-          this.orgCategoryDisabled = false;
-        }
+        // if (record.orgCategory == '1') {
+        //   this.orgCategoryDisabled = true;
+        // } else {
+        //   this.orgCategoryDisabled = false;
+        // }
+        console.log(record)
         this.$nextTick(() => {
-          this.form.getFieldDecorator('fax', {initialValue: ''})
-          this.form.setFieldsValue(pick(record, 'departName','orgCategory', 'orgCode', 'departOrder', 'mobile', 'fax', 'address', 'memo'))
+          //   this.form.getFieldDecorator('fax', {
+          //     initialValue: ''
+          //   })
+
+          //   this.form.setFieldsValue(pick(dataJson, ['appId', 'urlType', 'url', 'dayBudget', 'speed',
+          //     'showMode'
+          //   ]))
+          this.form.setFieldsValue(pick(record, ['tagName', 'tagCode', 'description']))
         })
       },
       getCurrSelectedTitle() {
@@ -445,7 +432,6 @@
         this.currSelected = {}
         this.form.resetFields()
         this.selectedKeys = []
-        this.$refs.departAuth.departId = ''
       },
       handleNodeTypeChange(val) {
         this.currSelected.nodeType = val
@@ -466,7 +452,7 @@
 
             let formData = Object.assign(this.currSelected, values)
             console.log('Received values of form: ', formData)
-            httpAction(this.url.edit, formData, 'put').then((res) => {
+            httpAction(this.url.edit, formData, 'post').then((res) => {
               if (res.success) {
                 this.$message.success('保存成功!')
                 this.loadTree()
@@ -491,17 +477,23 @@
         this.$refs.sysDirectiveModal.show()
       },
       handleAdd(num) {
+        console.log(this.currSelected)
         if (num == 1) {
           this.$refs.departModal.add()
           this.$refs.departModal.title = '新增'
         } else if (num == 2) {
-          let key = this.currSelected.key
-          if (!key) {
-            this.$message.warning('请先点击选中上级部门!')
-            return false
+          if (this.currSelected.level == 3) {
+            this.$message.warning('标签最多只能存在三级')
+          } else {
+            let key = this.currSelected.key
+            if (!key) {
+              this.$message.warning('请先点击选中上级标签!')
+              return false
+            }
+            this.$refs.departModal.add(this.selectedKeys)
+            this.$refs.departModal.title = '新增'
           }
-          this.$refs.departModal.add(this.selectedKeys)
-          this.$refs.departModal.title = '新增'
+
         } else {
           this.$refs.departModal.add(this.rightClickSelectedKey)
           this.$refs.departModal.title = '新增'
@@ -511,29 +503,40 @@
         var that = this
         this.$confirm({
           title: '确认删除',
-          content: '确定要删除此部门以及子节点数据吗?',
+          content: '确定要删除此标签以及子节点数据吗?',
           onOk: function () {
-            deleteByDepartId({id: that.rightClickSelectedKey}).then((resp) => {
-              if (resp.success) {
+            httpAction('/ctop/tagInfo/edit', {
+              id: that.rightClickSelectedKey,
+              delFlag: 1
+            }, 'post').then(res => {
+              if (res.success) {
                 //删除成功后,去除已选中中的数据
-                that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey), 1);
+                that.checkedKeys.splice(that.checkedKeys.findIndex(key => key === that.rightClickSelectedKey),
+                  1);
                 that.$message.success('删除成功!')
                 that.loadTree()
                 //删除后同步清空右侧基本信息内容
-                let orgCode=that.form.getFieldValue("orgCode");
-                if(orgCode && orgCode === that.rightClickSelectedOrgCode){
+                let orgCode = that.form.getFieldValue("orgCode");
+                if (orgCode && orgCode === that.rightClickSelectedOrgCode) {
                   that.onClearSelected()
                 }
               } else {
                 that.$message.warning('删除失败!')
               }
             })
+            // deleteByDepartId({
+            //   id: that.rightClickSelectedKey
+            // }).then((resp) => {
+
+            // })
           }
         })
       },
       selectDirectiveOk(record) {
         console.log('选中指令数据', record)
-        this.nodeSettingForm.setFieldsValue({directiveCode: record.directiveCode})
+        this.nodeSettingForm.setFieldsValue({
+          directiveCode: record.directiveCode
+        })
         this.currSelected.sysCode = record.sysCode
       },
       getFlowGraphData(node) {
@@ -552,25 +555,25 @@
           }
         }
       },
-     // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      expandAll () {
+      // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
+      expandAll() {
         this.iExpandedKeys = this.allTreeKeys
       },
-      closeAll () {
+      closeAll() {
         this.iExpandedKeys = []
       },
-      checkALL () {
+      checkALL() {
         this.checkStriccheckStrictlytly = false
         this.checkedKeys = this.allTreeKeys
       },
-      cancelCheckALL () {
+      cancelCheckALL() {
         //this.checkedKeys = this.defaultCheckedKeys
         this.checkedKeys = []
       },
-      switchCheckStrictly (v) {
-        if(v==1){
+      switchCheckStrictly(v) {
+        if (v == 1) {
           this.checkStrictly = false
-        }else if(v==2){
+        } else if (v == 2) {
           this.checkStrictly = true
         }
       },
@@ -584,7 +587,7 @@
         }
       }
       // <!---- author:os_chengtgen -- date:20190827 --  for:切换父子勾选模式 =======------>
-      
+
     },
     created() {
       this.currFlowId = this.$route.params.id

+ 0 - 188
src/views/modules/material/modules/DepartAuthModal.vue

@@ -1,188 +0,0 @@
-<template>
-  <a-card :bordered="false">
-    <template v-if="this.departId">
-      <a-form>
-        <a-form-item label='所拥有的权限'>
-          <a-tree
-            checkable
-            @check="onCheck"
-            :checkedKeys="checkedKeys"
-            :treeData="treeData"
-            @expand="onExpand"
-            @select="onTreeNodeSelect"
-            :selectedKeys="selectedKeys"
-            :expandedKeys="expandedKeysss"
-            :checkStrictly="checkStrictly"
-            style="height:500px;overflow: auto;">
-            <span slot="hasDatarule" slot-scope="{slotTitle,ruleFlag}">
-              {{ slotTitle }}
-              <a-icon v-if="ruleFlag" type="align-left" style="margin-left:5px;color: red;"></a-icon>
-            </span>
-          </a-tree>
-        </a-form-item>
-      </a-form>
-      <div class="anty-form-btn">
-        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
-          <a-menu slot="overlay">
-            <!-- 简化Tree逻辑,使用默认checkStrictly为false的行为,即默认父子关联
-            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
-            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
-            -->
-            <a-menu-item key="3" @click="checkALL">全部勾选</a-menu-item>
-            <a-menu-item key="4" @click="cancelCheckALL">取消全选</a-menu-item>
-            <a-menu-item key="5" @click="expandAll">展开所有</a-menu-item>
-            <a-menu-item key="6" @click="closeAll">合并所有</a-menu-item>
-          </a-menu>
-          <a-button>
-            树操作 <a-icon type="up" />
-          </a-button>
-        </a-dropdown>
-        <a-button style="float: right" @click="handleSubmit" type="primary" htmlType="button" icon="form">保存</a-button>
-      </div>
-    </template>
-    <a-card v-else :bordered="false" style="height:200px">
-      <a-empty>
-        <span slot="description"> 请先选择一个部门! </span>
-      </a-empty>
-    </a-card>
-    <depart-datarule-modal ref="datarule"/>
-  </a-card>
-</template>
-
-<script>
-  import {queryTreeListForRole,queryDepartPermission,saveDepartPermission} from '@/api/api'
-  import DepartDataruleModal from './DepartDataruleModal'
-
-  export default {
-    name: 'DepartAuthModal',
-    components: { DepartDataruleModal },
-    data(){
-      return {
-        departId:"",
-        treeData: [],
-        defaultCheckedKeys:[],
-        checkedKeys:[],
-        halfCheckedKeys:[],
-        expandedKeysss:[],
-        allTreeKeys:[],
-        autoExpandParent: true,
-        checkStrictly: false,
-        title:"部门权限配置",
-        visible: false,
-        loading: false,
-        selectedKeys:[]
-      }
-    },
-    methods: {
-      onTreeNodeSelect(id){
-        if(id && id.length>0){
-          this.selectedKeys = id
-        }
-        this.$refs.datarule.show(this.selectedKeys[0],this.departId)
-      },
-      onCheck (checkedKeys, { halfCheckedKeys }) {
-        // 保存选中的和半选中的,后面保存的时候合并提交
-        this.checkedKeys = checkedKeys
-        this.halfCheckedKeys = halfCheckedKeys
-      },
-      show(departId){
-        this.departId=departId
-        this.loadData();
-      },
-      close () {
-        this.reset()
-        this.$emit('close');
-        this.visible = false;
-      },
-      onExpand(expandedKeys){
-        this.expandedKeysss = expandedKeys;
-        this.autoExpandParent = false
-      },
-      reset () {
-        this.expandedKeysss = []
-        this.checkedKeys = []
-        this.defaultCheckedKeys = []
-        this.loading = false
-      },
-      expandAll () {
-        this.expandedKeysss = this.allTreeKeys
-      },
-      closeAll () {
-        this.expandedKeysss = []
-      },
-      checkALL () {
-        this.checkedKeys = this.allTreeKeys
-      },
-      cancelCheckALL () {
-        this.checkedKeys = []
-      },
-      handleCancel () {
-        this.close()
-      },
-      handleSubmit() {
-        let that = this;
-        if(!that.departId){
-          this.$message.warning('请点击选择一个部门!')
-        }
-        let checkedKeys = [...that.checkedKeys, ...that.halfCheckedKeys]
-        const permissionIds = checkedKeys.join(",")
-        let params =  {
-          departId:that.departId,
-          permissionIds,
-          lastpermissionIds:that.defaultCheckedKeys.join(","),
-        };
-        that.loading = true;
-        saveDepartPermission(params).then((res)=>{
-          if(res.success){
-            that.$message.success(res.message);
-            that.loading = false;
-            that.loadData();
-          }else {
-            that.$message.error(res.message);
-            that.loading = false;
-          }
-        })
-      },
-      convertTreeListToKeyLeafPairs(treeList, keyLeafPair = []) {
-        for(const {key, isLeaf, children} of treeList) {
-          keyLeafPair.push({key, isLeaf})
-          if(children && children.length > 0) {
-            this.convertTreeListToKeyLeafPairs(children, keyLeafPair)
-          }
-        }
-        return keyLeafPair;
-      },
-      emptyCurrForm() {
-        this.form.resetFields()
-      },
-      loadData(){
-        queryTreeListForRole().then((res) => {
-          this.treeData = res.result.treeList
-          this.allTreeKeys = res.result.ids
-          const keyLeafPairs = this.convertTreeListToKeyLeafPairs(this.treeData)
-          queryDepartPermission({departId:this.departId}).then((res)=>{
-            // 过滤出 leaf node 即可,即选中的
-            // Tree组件中checkStrictly默认为false的时候,选中子节点,父节点会自动设置选中或半选中
-            // 保存 checkedKeys 以及 halfCheckedKeys 以便于未做任何操作时提交表单数据
-            const checkedKeys = [...res.result].filter(key => {
-              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
-              return keyLeafPair && keyLeafPair.isLeaf
-            })
-            const halfCheckedKeys = [...res.result].filter(key => {
-              const keyLeafPair = keyLeafPairs.filter(item => item.key === key)[0]
-              return keyLeafPair && !keyLeafPair.isLeaf
-            })
-            this.checkedKeys = [...checkedKeys];
-            this.halfCheckedKeys = [...halfCheckedKeys]
-            this.defaultCheckedKeys = [...halfCheckedKeys, ...checkedKeys];
-            this.expandedKeysss = this.allTreeKeys;
-          })
-        })
-      }
-    },
-  }
-</script>
-
-<style scoped>
-
-</style>

+ 90 - 133
src/views/modules/material/modules/DepartModal.vue

@@ -1,144 +1,101 @@
 <template>
-  <a-modal
-    :title="title"
-    :width="800"
-    :ok=false
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :okButtonProps="{ props: {disabled: disableSubmit} }"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    cancelText="关闭">
+  <a-modal :title="title" :width="800" :ok=false :visible="visible" :confirmLoading="confirmLoading"
+    :okButtonProps="{ props: {disabled: disableSubmit} }" @ok="handleOk" @cancel="handleCancel" cancelText="关闭">
 
     <a-spin :spinning="confirmLoading">
       <a-form :form="form">
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="机构名称"
-          :hidden="false"
-          hasFeedback >
-          <a-input id="departName" placeholder="请输入机构/部门名称" v-decorator="['departName', validatorRules.departName ]"/>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签名称" :hidden="false" hasFeedback>
+          <a-input id="tagName" placeholder="请输入标签名称" v-decorator="['tagName', validatorRules.departName ]" />
         </a-form-item>
-        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :hidden="seen" label="上级部门" hasFeedback>
-        <a-tree-select
-          style="width:100%"
-          :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-          :treeData="departTree"
-          v-model="model.parentId"
-          placeholder="请选择上级部门"
-          :disabled="condition">
-        </a-tree-select>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签描述">
+          <a-input placeholder="请输入标签描述" v-decorator="['description']" />
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="机构类型">
-          <template v-if="seen">
-          <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-            <a-radio value="1">
-              公司
-            </a-radio>
-          </a-radio-group>
-          </template>
-          <template v-else>
-            <a-radio-group v-decorator="['orgCategory',validatorRules.orgCategory]" placeholder="请选择机构类型">
-              <a-radio value="2">
-                部门
-              </a-radio>
-              <a-radio value="3">
-                岗位
-              </a-radio>
-            </a-radio-group>
-          </template>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="标签编码">
+          <a-input placeholder="请输入标签描述" v-decorator="['tagCode',validatorRules.orgCode]"  :maxLength="4"/>
         </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="电话">
-          <a-input placeholder="请输入电话" v-decorator="['mobile',validatorRules.mobile]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="传真">
-          <a-input placeholder="请输入传真" v-decorator="['fax', {}]"  />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="地址">
-          <a-input placeholder="请输入地址" v-decorator="['address', {}]"  />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="排序">
-          <a-input-number v-decorator="[ 'departOrder',{'initialValue':0}]" />
-        </a-form-item>
-        <a-form-item
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="备注">
-          <a-textarea placeholder="请输入备注" v-decorator="['memo', {}]"  />
-        </a-form-item>
-
       </a-form>
     </a-spin>
   </a-modal>
 </template>
 
 <script>
-  import { httpAction } from '@/api/manage'
-  import { queryIdTree } from '@/api/api'
+  import {
+    httpAction
+  } from '@/api/manage'
+  import {
+    queryIdTree
+  } from '@/api/api'
   import pick from 'lodash.pick'
   import ATextarea from 'ant-design-vue/es/input/TextArea'
   export default {
     name: "SysDepartModal",
-    components: { ATextarea },
-    data () {
+    components: {
+      ATextarea
+    },
+    data() {
       return {
-        departTree:[],
-        orgTypeData:[],
-        phoneWarning:'',
-        departName:"",
-        title:"操作",
-        seen:false,
+        departTree: [],
+        orgTypeData: [],
+        phoneWarning: '',
+        departName: "",
+        title: "操作",
+        seen: false,
         visible: false,
-        condition:true,
-        disableSubmit:false,
+        condition: true,
+        disableSubmit: false,
         model: {},
-        menuhidden:false,
-        menuusing:true,
+        menuhidden: false,
+        menuusing: true,
         labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 5
+          },
         },
         wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
+          xs: {
+            span: 24
+          },
+          sm: {
+            span: 16
+          },
         },
 
         confirmLoading: false,
         form: this.$form.createForm(this),
-        validatorRules:{
-        departName:{rules: [{ required: true, message: '请输入机构/部门名称!' }]},
-        orgCode:{rules: [{ required: true, message: '请输入机构编码!' }]},
-         mobile:{rules: [{validator:this.validateMobile}]}
+        validatorRules: {
+          departName: {
+            rules: [{
+              required: true,
+              message: '请输入标签名称!'
+            }]
+          },
+          orgCode: {
+            rules: [{
+              required: true,
+              message: '请输入标签编码!'
+            }]
+          },
+          mobile: {
+            rules: [{
+              validator: this.validateMobile
+            }]
+          }
         },
         url: {
-          add: "/sys/sysDepart/add",
+          add: "/ctop/tagInfo/add",
         },
-        dictDisabled:true,
+        dictDisabled: true,
       }
     },
-    created () {
-    },
+    created() {},
     methods: {
-      loadTreeData(){
+      loadTreeData() {
         var that = this;
-        queryIdTree().then((res)=>{
-          if(res.success){
+        queryIdTree().then((res) => {
+          if (res.success) {
             that.departTree = [];
             for (let i = 0; i < res.result.length; i++) {
               let temp = res.result[i];
@@ -148,37 +105,37 @@
 
         })
       },
-      add (depart) {
-        if(depart){
+      add(depart) {
+        if (depart) {
           this.seen = false;
           this.dictDisabled = false;
-        }else{
+        } else {
           this.seen = true;
           this.dictDisabled = true;
         }
         this.edit(depart);
       },
-      edit (record) {
-          this.form.resetFields();
-          this.model = Object.assign({}, {});
-          this.visible = true;
-          this.loadTreeData();
-          this.model.parentId = record!=null?record.toString():null;
-          if(this.seen){
-            this.model.orgCategory = '1';
-          }else{
-            this.model.orgCategory = '2';
-          }
-          this.$nextTick(() => {
-            this.form.setFieldsValue(pick(this.model,'orgCategory','departName','departNameEn','departNameAbbr','departOrder','description','orgType','orgCode','mobile','fax','address','memo','status','delFlag'))
-          });
+      edit(record) {
+        this.form.resetFields();
+        this.model = Object.assign({}, {});
+        this.visible = true;
+        this.loadTreeData();
+        this.model.parentId = record != null ? record.toString() : null;
+        //   if(this.seen){
+        //     this.model.orgCategory = '1';
+        //   }else{
+        //     this.model.orgCategory = '2';
+        //   }
+        //   this.$nextTick(() => {
+        //     this.form.setFieldsValue(pick(this.model,'orgCategory','departName','departNameEn','departNameAbbr','departOrder','description','orgType','orgCode','mobile','fax','address','memo','status','delFlag'))
+        //   });
       },
-      close () {
+      close() {
         this.$emit('close');
         this.disableSubmit = false;
         this.visible = false;
       },
-      handleOk () {
+      handleOk() {
         const that = this;
         // 触发表单验证
         this.form.validateFields((err, values) => {
@@ -187,12 +144,12 @@
             let formData = Object.assign(this.model, values);
             //时间格式化
             console.log(formData)
-            httpAction(this.url.add,formData,"post").then((res)=>{
-              if(res.success){
+            httpAction(this.url.add, formData, "post").then((res) => {
+              if (res.success) {
                 that.$message.success(res.message);
                 that.loadTreeData();
                 that.$emit('ok');
-              }else{
+              } else {
                 that.$message.warning(res.message);
               }
             }).finally(() => {
@@ -203,13 +160,13 @@
           }
         })
       },
-      handleCancel () {
+      handleCancel() {
         this.close()
       },
-      validateMobile(rule,value,callback){
-        if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
+      validateMobile(rule, value, callback) {
+        if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) {
           callback();
-        }else{
+        } else {
           callback("您的手机号码格式不正确!");
         }
 

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 323 - 420
src/views/modules/material/videoMaterial.vue


+ 1 - 1
src/views/system/modules/PasswordModal.vue

@@ -97,7 +97,7 @@
           if (!err) {
             this.confirmLoading = true;
             let formData = Object.assign(this.model, values);
-            changPassword(formData).then((res) => {
+            changePassword(formData).then((res) => {
               if (res.success) {
                 this.$message.success(res.message);
                 this.$emit('ok');