Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/modelstandardconfiguration.vue

@@ -66,19 +66,6 @@ export default {
       this.sid_list.configSid = row.configSid
       this.sid_list.vehModelConfigSid = row.vehModelConfigSid
       this.sid_list.guidedPrice = row.price
-      // this.priceValidity = row.priceValidity
-      // selectExiCarConfig(this.sid_list).then((response) => {
-      //   this.FormLoading = false
-      //   if (response.code === '200') {
-      //     this.formobj = response.data
-      //   } else {
-      //     this.$notify({
-      //       title: '失败',
-      //       message: '查询失败',
-      //       type: 'error'
-      //     })
-      //   }
-      // })
     }
   }
 }

anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanli.vue

@@ -48,7 +48,7 @@
           <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
             <!--            <el-table-column width="50px" type="selection" align="center"/>-->
             <el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
-            <el-table-column label="操作" align="center" width="110px" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="130px" class-name="small-padding fixed-width">
               <template slot-scope="{row}"><!--v-show="!row.result"-->
                 <el-button size="mini" type="primary" v-show="row.showInspectedBtn" @click="handleYanche(row)">验车
                 </el-button>

anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@@ -111,6 +111,9 @@
             </el-input>
           </el-col>
         </el-row>
+        <el-row class="last_btn">
+          <el-button type="primary" size="small" @click="handleCreate()">车辆检查表</el-button>
+        </el-row>
       </el-form>
     </div>
   </div>
@@ -423,4 +426,8 @@ export default {
 .addinputw_copy{
   width: 92% !important;
 }
+.formadd .last_btn{
+  float: right;
+  top: 30px;
+}
 </style>

anrui-system-ui/src/views/Home/Home.vue

@@ -264,8 +264,8 @@
         } else if (index == '8') {
           let myPopup = window.open('http://120.46.131.15/message/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '1') {
-          //let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
-           let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
+          let myPopup = window.open('http://120.46.131.15/scm/#/' + '?token=' + getStorage(), '_blank')
+           // let myPopup = window.open('http://127.0.0.1:9531/scm/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '4') {
           let myPopup = window.open('http://120.46.131.15/fin/#/' + '?token=' + getStorage(), '_blank')
         } else if (index == '5') {

anrui-system-ui/src/views/dictManage/dictCommon.vue

@@ -165,6 +165,10 @@ export default {
         this.form.sid = ''
       },
       closeDict() {
+        this.form.parentSid = ''
+        this.form.dictType = ''
+        this.page.params.parentSid = ''
+        this.page.params.dictType = ''
         this.$emit('show', false)
       },
       editRow(row) {

anrui-system-ui/src/views/dictManage/dictManage.vue

@@ -5,9 +5,14 @@
       <div class="tab-header">
         <el-form ref="form" :inline="true" :model="form" label-width="80px">
           <el-row :gutter="20">
-            <el-col :span="14">
+            <el-col :span="6">
               <el-form-item label="分类名称">
-                <el-input v-model="page.params.dictTypeName"></el-input>
+                <el-input clearable v-model="page.params.dictTypeName"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="说明">
+                <el-input clearable v-model="page.params.remarks"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="10">