Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue

@@ -30,7 +30,7 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>维修单类型</div>
               <el-form-item prop="billType">
                 <el-select class="addinputInfo" v-model="formobj.billType" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" placeholder="请选择" @change="billTypeChange" clearable filterable>
@@ -38,7 +38,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty"><span class="icon">*</span>科目</div>
               <el-form-item prop="subject">
                 <el-select class="addinputInfo" :disabled="formobj.sitemVos.length > 0 || formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.subject" placeholder="请选择" @change="changeSubject" clearable filterable>
@@ -46,7 +46,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <div class="span-sty">索赔厂家</div>
               <el-form-item>
                 <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.claimManufacturer" placeholder="请选择" @change="changeClaimManufacturer" clearable filterable>
@@ -54,11 +54,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <div class="span-sty">索赔类型</div>
               <el-form-item>
                 <el-select class="addinputInfo" :disabled="formobj.nodeName == '维修' || formobj.nodeName == '结算'" v-model="formobj.shClaimTypeKey" placeholder="请选择" @change="changeShClaimType" clearable filterable>
-                  <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictKey" :value="item.dictKey"></el-option>
+                  <el-option v-for="item in shClaimType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -959,7 +959,7 @@ export default {
           this.otherSettle_list = res.data
         }
       })
-      typeValues({ type: 'shClaimType' }).then((res) => {
+      typeValues({ type: 'sh_claim_type' }).then((res) => {
         if (res.success) {
           this.shClaimType_list = res.data
         }

yxt-as-ui/src/views/operation/repairbill/repairbillInfo.vue

@@ -25,19 +25,19 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">维修单类型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.billType }}</span></el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="span-sty">科目</div>
               <el-form-item><span class="addinputInfo">{{ formobj.subject }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <div class="span-sty">索赔厂家</div>
               <el-form-item><span class="addinputInfo">{{ formobj.claimManufacturer }}</span></el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="6">
               <div class="span-sty">索赔类型</div>
               <el-form-item><span class="addinputInfo">{{ formobj.shClaimTypeValue }}</span></el-form-item>
             </el-col>