فهرست منبع

reactor:常用意见管理调整;

zhangchong 1 سال پیش
والد
کامیت
cd7f7c57e8

+ 17 - 12
src/components/CommonAdvice/index.vue

@@ -8,6 +8,7 @@
 			:placeholder="placeholder"
 			:maxlength="props.maxlength"
 			:disabled="props.disabled"
+      class="textarea-content"
 		>
 		</el-input>
 		<span class="buttons">
@@ -43,9 +44,9 @@
 				</div>
 			</template>
 			<div class="comments-container" v-loading="state.loading">
-				<el-tabs v-model="activeName" class="demo-tabs" @tab-change="handleClick" v-if="state.active === 'default'">
-					<el-tab-pane label="个人常用" name="personal"></el-tab-pane>
-					<el-tab-pane label="公共常用" name="public"></el-tab-pane>
+				<el-tabs v-model="activeName" @tab-change="handleClick" v-if="state.active === 'default'">
+					<el-tab-pane label="个人常用意见" name="personal"></el-tab-pane>
+					<el-tab-pane label="公共常用意见" name="public"></el-tab-pane>
 				</el-tabs>
 				<template v-if="state.adviceList.length">
 					<!-- 默认状态 -->
@@ -79,13 +80,14 @@
 				<template v-if="state.active === 'add'">
 					<div>
 						<el-form :model="state.adviceForm" ref="adviceFormRef">
-							<el-form-item label="" prop="content" :rules="[{ required: true, message: '请填写新增常用意见', trigger: 'blur' }]">
+							<el-form-item label="" prop="content" :rules="[{ required: true, message: '请填写常用意见内容', trigger: 'blur' }]">
 								<el-input
 									v-model="state.adviceForm.content"
 									type="textarea"
 									:autosize="{ minRows: 10, maxRows: 10 }"
-									placeholder="请填写新增常用意见"
-									clearable
+									placeholder="请填写常用意见内容"
+                  show-word-limit
+                  maxlength="200"
 								>
 								</el-input>
 							</el-form-item>
@@ -235,6 +237,7 @@ const getList = async () => {
 // 切换tab查询意见
 const handleClick = (val: string) => {
 	isOpen.value = val === 'public';
+  if(isOpen.value) state.manage = false;
 	getList();
 };
 // 选中常用意见(管理)
@@ -317,7 +320,14 @@ defineExpose({
 </script>
 <style lang="scss" scoped>
 .textarea {
-	position: relative;
+  .textarea-content{
+    position: relative;
+    :deep(.el-input__count) {
+      font-size: 16px;
+      bottom: 20px;
+      right: 250px;
+    }
+  }
 	.buttons {
 		position: absolute;
 		right: 10px;
@@ -326,11 +336,6 @@ defineExpose({
 	:deep(.el-textarea__inner) {
 		padding-bottom: 40px;
 	}
-	:deep(.el-textarea .el-input__count) {
-		font-size: 16px;
-		bottom: 20px;
-		right: 250px;
-	}
 }
 .comments-container {
 	.comments-box {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 612 - 543
src/views/business/order/accept/index.vue


+ 3 - 3
src/views/home/index.vue

@@ -3,7 +3,7 @@
 		<el-row :gutter="20">
 			<el-col :xs="24" :sm="24" :md="24" :lg="16" :xl="16" class="left-content">
 				<el-row :gutter="20">
-					<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+					<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
             <el-card shadow="never" v-loading="state.loading" class="statistics-item">
               <div class="statistics-title">
                 <img v-lazy="getImageUrl('home/Call.png')" alt="" src="" />
@@ -21,7 +21,7 @@
               </div>
             </el-card>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+					<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
 						<el-card shadow="never" v-loading="state.loading" class="statistics-item">
 							<div class="statistics-title">
 								<img v-lazy="getImageUrl('home/connectionRate.png')" alt="" src="" />
@@ -39,7 +39,7 @@
 							</div>
 						</el-card>
 					</el-col>
-					<el-col :xs="24" :sm="24" :md="8" :lg="8" :xl="8">
+					<el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="8">
 						<el-card shadow="never" v-loading="state.loading" class="statistics-item">
 							<div class="statistics-title">
 								<img v-lazy="getImageUrl('home/workOrder.png')" alt="" src="" />

+ 3 - 11
src/views/system/config/advice/component/Advice-add.vue

@@ -1,10 +1,10 @@
 <template>
-		<el-dialog v-model="state.dialogVisible" width="50%" draggable title="新增常用意见">
+		<el-dialog v-model="state.dialogVisible" width="800px" draggable title="新增常用意见">
 			<el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
 				<el-row :gutter="10">
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
 						<el-form-item label="意见内容" prop="content" :rules="[{ required: true, message: '请输入意见内容', trigger: 'blur' }]">
-							<el-input v-model="state.ruleForm.content" placeholder="请输入意见内容" clearable></el-input>
+							<el-input v-model="state.ruleForm.content" placeholder="请输入意见内容" clearable type="textarea" show-word-limit maxlength="200"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
@@ -14,14 +14,6 @@
               </el-select>
 						</el-form-item>
 					</el-col>
-					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-						<el-form-item label="是否公开意见" prop="isOpen" :rules="[{ required: false, message: '请选择是否公开意见', trigger: 'change' }]" label-width="120px">
-              <el-radio-group v-model="state.ruleForm.isOpen" class="ml-4">
-                <el-radio :label="true">公开常用意见</el-radio>
-                <el-radio :label="false">个人常用意见</el-radio>
-              </el-radio-group>
-						</el-form-item>
-					</el-col>
 				</el-row>
 			</el-form>
 			<template #footer>

+ 3 - 11
src/views/system/config/advice/component/Advice-edit.vue

@@ -2,26 +2,18 @@
 		<el-dialog v-model="state.dialogVisible" width="50%" draggable title="修改常用意见">
       <el-form :model="state.ruleForm" label-width="90px" ref="ruleFormRef">
         <el-row :gutter="10">
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
+          <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
             <el-form-item label="意见内容" prop="content" :rules="[{ required: true, message: '请输入意见内容', trigger: 'blur' }]">
-              <el-input v-model="state.ruleForm.content" placeholder="请输入意见内容" clearable></el-input>
+              <el-input v-model="state.ruleForm.content" placeholder="请输入意见内容" clearable type="textarea" show-word-limit maxlength="200"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
             <el-form-item label="意见类型" prop="commonType" :rules="[{ required: true, message: '请选择意见类型', trigger: 'change' }]">
-              <el-select v-model="state.ruleForm.commonType" placeholder="请选择意见类型" class="w100">
+              <el-select v-model="state.ruleForm.commonType" placeholder="请选择意见类型" clearable class="w100">
                 <el-option v-for="item in commonType" :value="item.key" :key="item.key" :label="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
-            <el-form-item label="是否公开意见" prop="isOpen" :rules="[{ required: false, message: '请选择是否公开意见', trigger: 'change' }]" label-width="120px">
-              <el-radio-group v-model="state.ruleForm.isOpen" class="ml-4">
-                <el-radio :label="true">公开常用意见</el-radio>
-                <el-radio :label="false">个人常用意见</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
 			<template #footer>

+ 22 - 7
src/views/system/config/advice/index.vue

@@ -3,10 +3,15 @@
     <el-card shadow="never">
       <el-form :model="state.queryParams" ref="ruleFormRef" :inline="true" @submit.native.prevent>
         <el-form-item label="意见类型" prop="CommonType">
-          <el-select v-model="state.queryParams.CommonType" placeholder="请选择意见类型" clearable class="w100">
+          <el-select v-model="state.queryParams.CommonType" placeholder="请选择意见类型">
             <el-option v-for="item in commonType" :value="item.key" :key="item.key" :label="item.value" />
           </el-select>
         </el-form-item>
+        <el-form-item label="常用语分类" prop="isOpen">
+          <el-select v-model="state.queryParams.isOpen" placeholder="请选择意见类型">
+            <el-option v-for="item in openState" :value="item.key" :key="item.key" :label="item.value" />
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="queryList" :loading="state.loading"> <SvgIcon name="ele-Search" class="mr5" />查询 </el-button>
           <el-button @click="resetQuery(ruleFormRef)" v-waves class="default-button"> <SvgIcon name="ele-Refresh" class="mr5" />重置 </el-button>
@@ -25,11 +30,11 @@
 			<!-- 表格 -->
 			<el-table :data="state.tableData" v-loading="state.loading" row-key="id" ref="multipleTableRef" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" />
-				<el-table-column prop="content" label="意见内容" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="content" label="意见内容" show-overflow-tooltip width="400"></el-table-column>
 				<el-table-column prop="commonTypeText" label="意见类型" show-overflow-tooltip width="130"></el-table-column>
-        <el-table-column prop="isOpen" label="是否公开意见" show-overflow-tooltip width="170">
+        <el-table-column prop="isOpen" label="常用意见分类" show-overflow-tooltip width="170">
           <template #default="{ row }">
-            {{row.isOpen ? '是' : '否'}}
+            {{row.isOpen ? '公开常用意见' : '个人常用意见'}}
           </template>
         </el-table-column>
 				<el-table-column prop="creatorName" label="创建人" show-overflow-tooltip></el-table-column>
@@ -84,13 +89,23 @@ const state = reactive<any>({
 		PageIndex: 1,
 		PageSize: 10,
     CommonType: '', // 常用意见类型
-		code: '', // 参数编码
+    isOpen: null, // 是否公开
 	},
 	total: 0, // 总条数
 	tableData: [], // 表格数据
 });
-const ruleFormRef = ref<any>(null); // 表单ref
-const commonType = ref<any>([]); // 常用意见类型
+const ruleFormRef = ref<RefType>(null); // 表单ref
+const commonType = ref<EmptyArrayType>([]); // 常用意见类型
+const openState = ref<EmptyArrayType>([
+  {
+    key: true,
+    value: '公开常用意见',
+  },
+  {
+    key: false,
+    value: '个人常用意见',
+  },
+]); // 是否公开
 const getBaseData = async ()=>{
   try {
     const res = await commonBaseData();

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است