Sfoglia il codice sorgente

'产品类型和系统展示别名称修改'

zhangyu 4 anni fa
parent
commit
209f191680

+ 3 - 3
src/components/product/sagaProduct.vue

@@ -20,7 +20,7 @@
           <div v-for="system in major.DefMajor" :key="system.Code" v-show="major.DefMajor && major.DefMajor.length">
             <div style="padding-bottom: 12px">
               <i class="iconfont iconjuxing" style="color:#3A8DDE;"></i>
-              <span>{{system.Name}}</span>
+              <span>{{system.AliasName}}</span>
             </div>
             <div class="sys" v-show="system.DefClass && system.DefClass.length" >
               <span
@@ -28,7 +28,7 @@
                 :key="equip.Code"
                 @click="handleDetail(equip,major,system)"
               >
-                {{equip.Name}}
+                {{equip.AliasName}}
               </span>
             </div>
           </div>
@@ -67,7 +67,7 @@
       console.log(val, 'val', major, system)
       this.$router.push({
         path: 'product/productDetail',
-        query: {major: major.Name, system: system.Name, class: val.Name,code:val.Code}
+        query: {major: major.Name, system: system.AliasName, class: val.AliasName, code:val.Code}
       })
     },
     getProductType() {// 获取产品类型数据

+ 3 - 3
src/components/public/remoteSearch.vue

@@ -48,7 +48,7 @@ export default {
             })
             let prodTypeList = res.Content[0].ProdType.map(item => {
               return Object.assign(item, {
-                value: `${item.DefMajor[0].DefClass[0].Name}(${item.DefMajor[0].DefClass[0].Code})`,
+                value: `${item.DefMajor[0].DefClass[0].AliasName}(${item.DefMajor[0].DefClass[0].AliasCode})`,
                 objectType: 'prodType'
               })
             })
@@ -75,8 +75,8 @@ export default {
           path: '/product/productDetail',
           query: {
             major: item.Name,
-            system: item.DefMajor[0].Name,
-            class: item.DefMajor[0].DefClass[0].Name,
+            system: item.DefMajor[0].AliasName,
+            class: item.DefMajor[0].DefClass[0].AliasName,
             code: item.DefMajor[0].DefClass[0].Code
           }
         })

+ 27 - 40
src/components/supplement/sagaSupplement.vue

@@ -9,24 +9,24 @@
       <el-form label-position="top" :model="ruleForm" :rules="rules" ref="ruleForm">
         <section class="d_jump">
           <p class="title"><i class="iconfont iconjuxing" style="color:#3A8DDE;"></i>基本信息</p>
-          <el-form-item label="产品类型" prop="product">
-            <el-select v-model="ruleForm.product" filterable placeholder="请选择" @change="handleChangeProduct">
+          <el-form-item label="产品类型" prop="ProdCode">
+            <el-select v-model="ruleForm.ProdCode" filterable placeholder="请选择" @change="handleChangeProduct">
               <el-option-group v-for="group in productList" :key="group.label" :label="group.text">
                 <el-option v-for="item in group.options" :key="item.Code" :label="item.AliasName"
                            :value="item.Code"></el-option>
               </el-option-group>
             </el-select>
           </el-form-item>
-          <el-form-item label="品牌" prop="brand">
-            <el-select v-model="ruleForm.brand" filterable remote @change="handleChangeBrand"
+          <el-form-item label="品牌" prop="BrandID">
+            <el-select v-model="ruleForm.BrandID" filterable remote @change="handleChangeBrand"
                        placeholder="请选择" :remote-method="remoteMethods" :loading="loading">
               <el-option v-for="item in brandList" :key="item.BrandID"
                          :label="`${item.BrandCname}${item.BrandName?`(${item.BrandCname})`:''}`"
                          :value="item.BrandID"/>
             </el-select>
           </el-form-item>
-          <el-form-item label="型号" prop="type">
-            <el-input v-model="ruleForm.type" />
+          <el-form-item label="型号" prop="Model">
+            <el-input v-model="ruleForm.Model" />
           </el-form-item>
         </section>
         <section class="d_jump">
@@ -35,26 +35,26 @@
             <el-form-item :label="item.Name">
               <el-input
                 v-if="item.InputMode == 'B1' || item.InputMode == 'B2'"
-                v-model="ruleForm[item.Code]"/>
+                v-model="ruleForm.ProdParam[item.Code]"/>
 
               <el-input
                 v-else-if="item.InputMode == 'A1'||item.InputMode == 'A2'"
                 type="number"
-                v-model="ruleForm[item.Code]">
+                v-model="ruleForm.ProdParam[item.Code]">
                 <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
               </el-input>
 
               <el-select
                 v-else-if="item.InputMode == 'D1' || item.InputMode == 'E2'"
                 placeholder="请选择"
-                v-model="ruleForm[item.Code]">
+                v-model="ruleForm.ProdParam[item.Code]">
                 <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>
               </el-select>
 
               <!--              <el-select-->
               <!--                v-else-if="item.InputMode == 'D2'"-->
               <!--                placeholder="请选择"-->
-              <!--                v-model="ruleForm[item.Code]"-->
+              <!--                v-model="ruleForm.ProdParam[item.Code]"-->
               <!--                multiple-->
               <!--                collapse-tags>-->
               <!--                <el-option :key="op.Name" :label="op.Name" :value="op.Code" v-for="op in item.options"></el-option>-->
@@ -62,7 +62,7 @@
 
               <el-date-picker
                 v-else-if="item.InputMode == 'C6'"
-                v-model="ruleForm[item.Code]"
+                v-model="ruleForm.ProdParam[item.Code]"
                 type="daterange"
                 value-format="yyyy-MM-dd"
                 range-separator="至"
@@ -73,7 +73,7 @@
                 v-else-if="item.InputMode == 'D1L'"
                 placeholder="请选择"
                 :options="item.options"
-                v-model="ruleForm[item.Code]"
+                v-model="ruleForm.ProdParam[item.Code]"
                 :props="item.props"
                 filterable
                 :show-all-levels="false"
@@ -82,18 +82,18 @@
 
               <el-input
                 v-else-if="item.InputMode == 'L'||item.InputMode == 'L1'||item.InputMode == 'L2'||item.InputMode == 'M'"
-                v-model="ruleForm[item.Code]">
+                v-model="ruleForm.ProdParam[item.Code]">
                 <template slot="append" v-if="item.Unit">{{item.Unit}}</template>
               </el-input>
 
               <el-date-picker
-                v-else-if="item.InputMode == 'C5'" v-model="ruleForm[item.Code]"
+                v-else-if="item.InputMode == 'C5'" v-model="ruleForm.ProdParam[item.Code]"
                 placeholder="选择日期"
                 value-format="yyyy-MM-dd"
                 type="date">
               </el-date-picker>
 
-              <el-input v-else v-model="ruleForm[item.Code]"/>
+              <el-input v-else v-model="ruleForm.ProdParam[item.Code]"/>
 
             </el-form-item>
           </template>
@@ -104,7 +104,7 @@
           <p class="title"><i class="iconfont iconjuxing" style="color:#3A8DDE;"></i>附件信息</p>
           <template v-for="(item,index) in AttachmentInfo">
             <el-form-item :label="item.Name">
-              <uploadFiles :readOnly="read" :keysArr="keysArr" @change="changeItem" v-model="ruleForm[item.Code]"/>
+              <uploadFiles :readOnly="read" :keysArr="keysArr" @change="changeItem" v-model="ruleForm.ProdFile[item.Code]"/>
             </el-form-item>
           </template>
 
@@ -130,11 +130,6 @@
       console.log(this.$route.query)
       let listener = document.querySelector('.saga-brand-box')
       listener.addEventListener('scroll', this.onScroll)
-      //  option
-      this.list = this.states.map(item => {
-        return {value: `value:${item}`, label: `label:${item}`}
-      })
-
     },
     data() {
       let checkBrand = (rule, value, callback) => {
@@ -148,7 +143,6 @@
         TechnicalData: [],
         AttachmentInfo: [],
         read: false,
-        list: [],
         keysArr: [],
         loading: false,
         bbs: [],
@@ -157,19 +151,20 @@
         stepActive: '0',
         tabPosition: 'left',
         ruleForm: {
-          product: '',
-          brand: [],
-          type: '',
-
+          ProdCode: '',
+          BrandID: [],
+          Model: '',
+          ProdParam: {},
+          ProdFile: {},
         },
         rules: {
-          product: [
+          ProdCode: [
             {required: true, message: '请选择产品类型', trigger: 'change'}
           ],
-          brand: [
+          BrandID: [
             {required: true, validator: checkBrand, trigger: 'blur'}
           ],
-          type: [
+          Model: [
             {required: true, message: '请输入型号', trigger: 'blur'}
           ]
         }
@@ -223,7 +218,6 @@
         })
         this.AttachmentInfo = res.Content.AttachmentInfo
       })
-
     },
     handleChangeBrand(item) {// 切换品牌
       debugger
@@ -289,6 +283,7 @@
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           console.log(this.ruleForm);
+          debugger
         } else {
           console.log('error submit!!');
           return false;
@@ -304,23 +299,15 @@
 }
 </script>
 <style lang="scss" scoped>
-@media screen and (max-width: 1500px) {
-  .saga-supplement-box {
-    height: 500px;
-    border: 1px solid #42b983;
-  }
-}
-
 .saga-supplement-box {
   position: relative;
-  height: 800px;
+  height: 100%;
   margin-top: 90px;
   background: #fff;
 
   .saga-brand-box {
     width: 100%;
-    max-height: 800px;
-    /*margin-top: 90px;*/
+    height: 100%;
     padding: 16px;
     box-sizing: border-box;
     background: rgba(255, 255, 255, 1);

+ 1 - 1
src/framework/layout/Main.vue

@@ -91,7 +91,7 @@ export default {
           padding: 0;
           margin: 0 auto;
           box-sizing: border-box;
-          height: 100%;
+          height: calc(100% - 90px);
         }
       }
     }

+ 12 - 0
src/framework/style/reset.scss

@@ -89,4 +89,16 @@ table {
 /*---滚动框背景样式--*/
 ::-webkit-scrollbar-track-piece{
 	
+}
+
+
+/*---数字输入框去掉上下箭头--*/
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+  -webkit-appearance: none !important;
+  margin: 0; 
+}
+
+input[type="number"] {
+  -moz-appearance: textfield;
 }

+ 3 - 1
src/views/supplement/index.vue

@@ -21,5 +21,7 @@
 </script>
 
 <style scoped>
-
+.supplement {
+  height: 100%;
+}
 </style>