ui

src/views/common-settings/ItemType.vue

@@ -75,14 +75,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="合并组合" prop="isMergeAsbitem">
-              <el-select v-model="form.isMergeAsbitem" placeholder="请选择" style="width: 100%" size="small">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="检查类别" prop="checkTypeFlag">
               <el-select v-model="form.checkTypeFlag" placeholder="请选择" style="width: 100%" size="small">
@@ -98,10 +90,19 @@
                 </el-option>
               </el-select>
             </el-form-item>
+          </el-col>
+                    <el-col :span="12">
+            <el-form-item label="合并组合" prop="isMergeAsbitem">
+              <!-- <el-select v-model="form.isMergeAsbitem" placeholder="请选择" style="width: 100%" size="small">
+                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select> -->
+              <el-checkbox v-model="form.isMergeAsbitem" true-label="Y" false-label="N" />
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="结果是否换行" prop="lineModeFlagBox" label-width="100px">
-              <el-checkbox v-model="form.lineModeFlagBox" @change="boxToVal('lineModeFlag')" />
+            <el-form-item label="结果是否换行" prop="isWrap" label-width="100px">
+              <el-checkbox v-model="form.isWrap" true-label="Y" false-label="N" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -195,7 +196,7 @@ export default {
         checkTypeFlag: "",
         guidTypeId: "",
         medicalReportTypeId: "",
-        lineModeFlag: '0', // 是否换行
+        isWrap: 'N', // 是否换行
         lineModeFlagBox: false,  // 是否换行box
       },
       value: "", //指引类别选择的数据
@@ -215,39 +216,6 @@ export default {
     ...mapState(["window"]),
   },
   methods: {
-    // 将 Box值 转成 数据库数据值
-    boxToVal(type) {
-      // console.log('this.form',this.form)
-      let val = 'N'
-      switch (type) {
-        case 'lineModeFlag':
-          if (this.form[type + 'Box']) {
-            val = '1';
-          } else {
-            val = '0';
-          }
-          break;
-        default:
-          //赋值
-          if (this.form[type + 'Box']) val = 'Y'
-          break;
-      }
-      this.form[type] = val
-    },
-
-    // 将 数据库数据值 转成 Box值
-    valToBox(type){
-      let boxVal = false
-      switch (type) {
-        case 'lineModeFlag':
-          if(this.form[type] == '1') boxVal = true           
-          break;      
-        default:
-          if(this.form[type] == 'Y') boxVal = true  
-          break;
-      }
-      this.form[type + 'Box'] = boxVal
-    },
 
     cascaderchang(v) {
       this.departmentname = v[v.length - 1];
@@ -276,7 +244,6 @@ export default {
       projecttype(id).then((res) => {
         if (res.code != -1) {
           objCopy(res.data,this.form)
-          this.valToBox('lineModeFlag') // 将 数据库数据值 转成 Box值
         }
       });
       // getapi(`/api/app/item/in-item-type/${data.id}`).then((res) => {
@@ -377,7 +344,7 @@ export default {
                 checkTypeFlag: this.form.checkTypeFlag,
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
-                lineModeFlag: this.form.lineModeFlag
+                isWrap: this.form.isWrap
               }).then((res) => {
                 if (res.code != -1) {
                   this.$message.success("新增成功");
@@ -394,7 +361,7 @@ export default {
                 checkTypeFlag: this.form.checkTypeFlag,
                 guidTypeId: this.form.guidTypeId,
                 medicalReportTypeId: this.form.medicalReportTypeId,
-                lineModeFlag: this.form.lineModeFlag
+                isWrap: this.form.isWrap
               }).then((res) => {
                 if (res.code != -1) {
                   this.$message.success("新增成功");
@@ -414,7 +381,7 @@ export default {
               checkTypeFlag: this.form.checkTypeFlag,
               guidTypeId: this.form.guidTypeId,
               medicalReportTypeId: this.form.medicalReportTypeId,
-              lineModeFlag: this.form.lineModeFlag
+              isWrap: this.form.isWrap
             }).then((res) => {
               if (res.code != -1) {
                 this.$message.success("修改成功");

src/views/fee-settings/PayMode.vue

@@ -170,14 +170,14 @@ export default {
       this.tableData.forEach((item, index) => {
         // index 从0开始的， displayOrder从大到小排
         // const currentDisplayOrder = this.tableData.length -1
-        const currentDisplayOrder = this.initTableData[index].displayOrder;
-        if (item.displayOrder != currentDisplayOrder) {
+        // const currentDisplayOrder = this.initTableData[index].displayOrder;
+        // if (item.displayOrder != currentDisplayOrder) {
           // 如果它的displayOrder和它当前所在的位置不同代表挪动过位置
           result.push({
             id: item.id,
-            displayOrder: currentDisplayOrder,
+            displayOrder: index+1,
           });
-        }
+        // }
       });
       paymentdraganddrop({ itemList: result }).then((res) => {
         if(res.code!=-1){

src/views/login/Login.vue

@@ -238,4 +238,13 @@ export default {
   height: 40px;
   width: 100%;
 }
+:deep .el-input--prefix .el-input__inner {
+    padding-left: 30px;
+}
+:deep .el-form-item {
+    margin-bottom: 22px;
+}
+:deep .el-button{
+  color: #fff;
+}
 </style>