From fce14ea749de62111e78f928687a08ec0553bb2a Mon Sep 17 00:00:00 2001
From: lvxudong <lvxudongt@yxqiche.com>
Date: Wed, 22 Nov 2023 18:21:56 +0800
Subject: [PATCH] up

---
 src/api/question/title/types.ts               |   2 +-
 src/assets/images/add-icon.png                | Bin 0 -> 918 bytes
 src/assets/images/del-icon.png                | Bin 0 -> 854 bytes
 .../Options/{positionConfig.vue => index.vue} |  29 +++----
 src/views/question/title/index.vue            |  82 ++++++++++++++----
 5 files changed, 81 insertions(+), 32 deletions(-)
 create mode 100644 src/assets/images/add-icon.png
 create mode 100644 src/assets/images/del-icon.png
 rename src/components/Options/{positionConfig.vue => index.vue} (78%)

diff --git a/src/api/question/title/types.ts b/src/api/question/title/types.ts
index 3344293..2d66ac8 100644
--- a/src/api/question/title/types.ts
+++ b/src/api/question/title/types.ts
@@ -38,7 +38,7 @@ export interface TitleForm extends BaseEntity {
 
   labelName : string;
 
-  // optionVoList : OptionVoList[];
+  optionVoList : OptionVoList[];
 
 }
 
diff --git a/src/assets/images/add-icon.png b/src/assets/images/add-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..be5f7932261efaaf9980649d24244fd4f76c61e4
GIT binary patch
literal 918
zcmV;H18Mw;P)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px&P)S5VR9FekSWQS&Q562}n?Er}#TrGCbRh;62{P0$L=bHvXvAP>k<_kzP*fl)
zZE6>-0*MxZv@jDjq9}+KnUqK_tOOx{LdjoroUu25uXA7Cndi*B=W}$XE)3`YoR4$Q
zyYIeXFuAS{!!{qsDJ6y`1vsiGs02e5g<BXf2L-bvkCXhuq2Nuo7aJy1t8SFTc=<=*
z`YofCDY#4kN{ziYtqdW?@JwOo7&w6+W@2=K_{U(E1GtGeZV&*cnPjOx1SU+KdgzqU
z*5$!ks$DB*1kyZ;@@NP>l;ot=IcuKb8+Fvz@5O{(jx-?WKj8?Xcu4^V^@6h0uULWR
zUN7Efir)f6?L-ita{xlEO<T2Uv%%Bj#`jb(l2GuOhy~G`D-gU6J!vJ82nPIvC=+!B
zO#qSCaGQqGD-5}!1g1`wa6dJ_3dA>r3L4DosYWBY)K-DVjWg(SFQK-u!N@h;rl5st
z9@83BAcV4wx>2MxY{&EB2OQOK+RAXq>DkVGi=FC8^t-23O8ms6iM^y%=7~RhVVF+m
z%_Yr8ahlMT2u0qg0v3&+Nz{{KN>UKYd{G()pQy!W<ggI(PL*VBE6qn0A=6zhdkyNH
z$J6Y!g~_3>+t-No{r)tc>ChNvHom6mg@O*aN*W7BRAIhB1dN`TM~#yxchrd39Z@;9
zftFzx<akgwuE-A8Q#Tg*))+NJH^E*TnC~OTsXg_2iH)}AVs)z;_WD;RzO24YOJQPb
z!hIeT@U5{@J7y_^E|7)r6c(1I(uxG5s|npia0DNgx)ZWlh8i%(L2!S*HTu(JHe<Ga
zELmHk3uj-pd3GBoDaqPWxfSoIJ;^@rHoMt)+7gQ${lZ=9bR$BW)Fl*oq_3X4>Gr?5
z)VD8n<PIHd>q2RUPKHLYDE~wtvW)S-keQH#57mp)?^Z%V4AuX;=rL}mDee$*E-91n
zq~C)p+8Sy{xWZA4yM$^`Ys>{totSXMaV<4>q9fe!UtFF!klqH&!-{jnPIGyW*NTO%
z9GPzLyv~-6h{FHk11m8j0tBbLGX=#sLqpX@NCR5iPI#J!FvUM8X7Ct&<?);uJEAR?
s?MFDhL3&_8`>sF2wO}}(>%S%b0J`205j8O}eE<Le07*qoM6N<$f|in~EdT%j

literal 0
HcmV?d00001

diff --git a/src/assets/images/del-icon.png b/src/assets/images/del-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9edd2e96706597e64923fa520868347d729611bd
GIT binary patch
literal 854
zcmV-c1F8IpP)<h;3K|Lk000e1NJLTq001HY001Be1^@s6caN&c00001b5ch_0Itp)
z=>Px&5J^NqR9FekSj}q_K@@*)y4hGURFqbll!7!^Foi1hP(%dr=Ap%d;K~2NgQy@?
zyy!s?PyPc6f)?=u5j=<&dyrm4tZ7ry3Z~d7p{6v+=HvNhWVYM5yIE~EIuPc~%$xW7
z?VFkRW`Yo~(AZd{mM<Ky15Wak5d`W7z&H?f5#R~{<p41agwLY`y{~X)rWDY$Qo~lt
zluY(kExJNL=ZIi;D}6c6MmLz$BNL5lxSY-goa3%Wsg!B0moEar1tN;MYx(ygqQ#`{
zMogT-Oy-B5wyQ^IXsEAJrD-N{%x`kgF(x!;MqmOL7c*XSej`#DOs0q$FL=VB*QCGc
zM}&e9;&fyw^Tuud79z?M7QJgX2@T9-)<78J(WUuMx=+_a3u;eP;W4+{>IrRM*1Xw!
zs9t}@SbLoPQnra$#nNTolt-Ht+TW(6RV?3bwyTzg_K)ndYNZSx(Ou07VYC^v0Y>C-
zG@E{}?JJK|Y8z9XA|ZiEu0*YNQ<IQ2%7|&@3wgPI&VjIH_6nIIn!x2bj>^oewz_tr
z(<CG?dj+eFicA-(h&nXvhVJZC%{gj9WAPrrgSye_nviU4gR^Ly-Q-;oaS(?_y~lk<
zXnp}`!859Ja>RZP8Jq!-4E9J|t(b>F^Wg))frQ7Xe>auOV2vIDD7oJVn1l(#!+Y7v
zH^H=g9pVqwzEOkYt~@@TY2G?>c3Vs1<qi1>@|pnY^mi7(;GLV}r8(gFZC`TG;9nSp
zgXoIfAJR6T8u}OpND!MyXk&{m5Kn?k3PXoi#KsmzU(aiGPY46a$EFPN5j3A_6@jy}
zRSxm@bw}rFe5vz{#8lZgYV5qu!DYQuBz|23j7v^DMFg`SzH%PE<s1lAM!e^|i%2X*
zL<(lC`vxDSw^9zbV8)E?INyxHUfL}G#pPMj;djR>qBzCk=S_O;k@#fF=ftGj4PGK_
z@rZ`}7Y{6Zk7yE#9eXAk>pqEspNfb@=h&afGM5O%JEn=_ey==**~;)X9^upc2*0}R
gM|d;Au>Y3$30yuVLt3$Wc>n+a07*qoM6N<$f}L)aTmS$7

literal 0
HcmV?d00001

diff --git a/src/components/Options/positionConfig.vue b/src/components/Options/index.vue
similarity index 78%
rename from src/components/Options/positionConfig.vue
rename to src/components/Options/index.vue
index 741b7f5..eeb187b 100644
--- a/src/components/Options/positionConfig.vue
+++ b/src/components/Options/index.vue
@@ -1,23 +1,22 @@
 <!-- 档位配置 插件 -->
 <template>
-    <Form ref="formPosition" :label-width="configWidth" :model="formData" :rules="ruleValidate" style="padding-bottom:20px">
-        <FormItem :label="`选项${index + 1}：`" v-for="(item,index) in posNum" :key="item" class="m-t-20"
-            :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue">
-            <InputNumber
-                :min="0"
-                :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
-                placeholder="请填写" :disabled="isSee" class="w-200"
-                v-model="formData.gearValue[index]"
-            />
-            <img v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')">
-            <img v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn">
-        </FormItem>
-    </Form>
+  <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
+    :prop="`gearValue[${index}]`" :rules="ruleValidate.gearValue" align="center" prop="options">
+    <el-input
+      :min="0"
+      :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')"
+      placeholder="请填写" :disabled="isSee" class="w-200"
+      v-model="form.value.options[index]"
+    />
+    <v-image v-if="!isSee&&posNum<maxPosLen" :src="addImg" class="img-btn" @click="changePos(index,'add')"/>
+    <v-image v-if="!isSee&&posNum>1" :src="delImg" @click="changePos(index,'del')" class="img-btn"/>
+  </el-table-column>
 </template>
 
+
 <script>
-import addImg from '@/assets/image/add-icon.png'
-import delImg from '@/assets/image/del-icon.png'
+import addImg from '@/assets/images/add-icon.png'
+import delImg from '@/assets/images/del-icon.png'
 export default {
     props: {
         enumData: {
diff --git a/src/views/question/title/index.vue b/src/views/question/title/index.vue
index 4418f52..da24bd3 100644
--- a/src/views/question/title/index.vue
+++ b/src/views/question/title/index.vue
@@ -56,7 +56,8 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['question:title:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                v-hasPermi="['question:title:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
@@ -77,20 +78,16 @@
         </el-form-item>
         <el-form-item label="标签" prop="labelId">
           <el-select v-model="form.labelId" @change="handleLabelChange" placeholder="请选择标签">
-            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label"
-              :value="dict.value"></el-option>
+            <el-option v-for="dict in labelList" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-table-column label="选项" align="center" prop="options">
-          <PositionConfig>
-
-          </PositionConfig>
-          <!-- <RadioGroup v-model="options" @change="changeFeeType($event, 'base')">
-                <Radio v-for="(item, index) in currentRowArr[1].feeTypeList" :key="index" :disabled="isSee"
-                    :label="item.itemCode">{{ item.itemName }}
-                </Radio>
-            </RadioGroup> -->
+        <el-table-column :label="`选项${index + 1}：`" v-for="(item, index) in posNum" :key="item" class="m-t-20"
+          :prop="`gearValue[${index}]`" :rules="ruleValidate" align="center" prop="options">
+          <el-input :min="0" :formatter="value => `${value}`.replace(/([0-9]+\.[0-9]{2})[0-9]*/, '$1')" placeholder="请填写"
+            :disabled="isSee" class="w-200" v-model="form.value.options[index]" />
+          <v-image v-if="!isSee && posNum < maxPosLen" :src="addImg" class="img-btn" @click="changePos(index, 'add')" />
+          <v-image v-if="!isSee && posNum > 1" :src="delImg" @click="changePos(index, 'del')" class="img-btn" />
         </el-table-column>
 
       </el-form>
@@ -109,6 +106,8 @@ import { queryAllLabel } from '@/api/question/label';
 import { listTitle, getTitle, delTitle, addTitle, updateTitle } from '@/api/question/title';
 import { TitleVO, TitleQuery, TitleForm } from '@/api/question/title/types';
 import { func } from 'vue-types';
+import addImg from '@/assets/images/add-icon.png'
+import delImg from '@/assets/images/del-icon.png'
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 
 const titleList = ref<TitleVO[]>([]);
@@ -119,7 +118,7 @@ const ids = ref<Array<string | number>>([]);
 const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
-const labelList = ref<DictDataOption[]>([]);
+const labelList = ref<DictDataOption[]>([]); let posNum = 20
 
 const queryFormRef = ref<ElFormInstance>();
 const titleFormRef = ref<ElFormInstance>();
@@ -133,8 +132,8 @@ const initFormData: TitleForm = {
   id: undefined,
   question: undefined,
   labelId: undefined,
-  labelName : "",
-  options : [],
+  labelName: "",
+  optionVoList: [],
 }
 const data = reactive<PageData<TitleForm, TitleQuery>>({
   form: { ...initFormData },
@@ -172,7 +171,7 @@ const getList = async () => {
 
 const getLabelList = async () => {
   loading.value = true;
-  queryAllLabel().then((resp)=>{
+  queryAllLabel().then((resp) => {
     labelList.value = resp.data.map((p: any): DictDataOption => ({ label: p.label, value: p.value, elTagType: "", elTagClass: "" }));
   });
   loading.value = false;
@@ -266,8 +265,59 @@ const handleExport = () => {
   }, `title_${new Date().getTime()}.xlsx`)
 }
 
+/**
+ * 增删档位
+ * @param idx
+ * @param actType
+ */
+const changePos = (idx: number, actType: string) => {
+  if (actType === 'add') {
+    if (form.value.optionVoList.length < 20) {
+      posNum++;
+      form.value.optionVoList.splice(idx + 1, 0);
+    }
+  } else {
+    form.value.optionVoList.splice(idx, 1);
+    posNum--;
+  }
+}
+
+/**
+ * 提交的校验
+ */
+const handleValidate = () =>{
+  return new Promise((resolve, reject) => {
+        $refs.formPosition.validate((valid) => {
+          if (valid) {
+            // 数据转换为接口所需要的形式
+            let obj = {};
+            if (form.value.optionVoList) {
+              if (form.value.optionVoList.length[0] === null) {
+                obj.optionVoList = null;
+              } else {
+                obj.optionVoList = form.value.optionVoList.join();
+              }
+            } else {
+              obj.optionVoList = null;
+            }
+            resolve(obj)
+          }
+        })
+      })
+}
+
 onMounted(() => {
   getList();
   getLabelList();
 });
 </script>
+
+<style scoped>
+.img-btn {
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 10px;
+  width: 20px;
+  cursor: pointer;
+}
+</style>