Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@@ -1106,6 +1106,20 @@
                                 </w:rPr>
                             </w:pPr>
                         </w:p>
+                        <w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
+                            <w:pPr>
+                                <w:widowControl/>
+                                <w:spacing w:line="240" w:line-rule="exact"/>
+                                <w:rPr>
+                                    <w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/>
+                                    <wx:font wx:val="宋体"/>
+                                    <w:color w:val="333333"/>
+                                    <w:kern w:val="0"/>
+                                    <w:sz w:val="18"/>
+                                    <w:sz-cs w:val="20"/>
+                                </w:rPr>
+                            </w:pPr>
+                        </w:p>
                     </w:tc>
                 </w:tr>
             </w:tbl>

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@@ -467,7 +467,7 @@ export default {
           this.temp.customerSid = resp.data.customerSid
           this.temp.mobile = resp.data.mobile
           this.temp.giftsDescription = resp.data.totaldiscount
-          this.temp.salesAllowance = resp.data.carDiscountPrice
+          // this.temp.salesAllowance = resp.data.carDiscountPrice
           this.temp.middleOne = resp.data.intermediaryName
           this.temp.rebateMoneyOne = resp.data.distributorPrice
           this.temp.middleTwo = resp.data.intermediaryName2

anrui-scm/anrui-scm-ui/src/views/purchasereceipt/purchasereceipt.vue

@@ -347,11 +347,22 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行重推操作' })
         return
       } else {
+        const loading = this.$loading({
+          lock: true,
+          text: '数据推送中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
         req.ctcgykd({ cgrkdSid: this.sids[0] }).then((resp) => {
           if (resp.success) {
+            loading.close()
             this.$message({ showClose: true, type: 'success', message: '推送成功' })
             this.getList()
+          } else {
+            loading.close()
           }
+        }).catch(() => {
+          loading.close()
         })
       }
     },

anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangguanli/shangzhuangAdd.vue

@@ -96,7 +96,10 @@
           <el-col :span="12">
             <div class="span-sty spanOneWidth"><span>篷布滑道</span></div>
             <el-form-item>
-              <el-input v-model="formobj.tarpaulinSlide" placeholder="篷布滑道" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.tarpaulinSlide" @change="changeTarpaulinSlide" class="addinputw addinputwOne" clearable @clear="clearTarpaulinSlide" filterable placeholder="请选择">
+                <el-option v-for="item in tarpaulinSlide_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -110,13 +113,19 @@
           <el-col :span="12">
             <div class="span-sty spanOneWidth"><span>自卸液压盖板</span></div>
             <el-form-item>
-              <el-input v-model="formobj.selfUnHyCoPl" placeholder="自卸液压盖板" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.selfUnHyCoPl" @change="changeSelfUnHyCoPl" class="addinputw addinputwOne" filterable clearable @clear="clearSelfUnHyCoPl" placeholder="请选择">
+                <el-option v-for="item in selfUnHyCoPl_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="span-sty spanOneWidth"><span>底板加热</span></div>
             <el-form-item>
-              <el-input v-model="formobj.floorHeating" placeholder="底板加热" class="addinputw addinputwOne" clearable/>
+              <el-select v-model="formobj.floorHeating" @change="changeFloorHeating" class="addinputw addinputwOne" filterable clearable @clear="clearFloorHeating" placeholder="请选择">
+                <el-option v-for="item in floorHeating_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -148,6 +157,9 @@ export default {
       color_list: [],
       refitMethod_list: [],
       plateMaterial_list: [],
+      tarpaulinSlide_list: [],
+      selfUnHyCoPl_list: [],
+      floorHeating_list: [],
       refitFactory_list: [],
       formobj: {
         sid: '',
@@ -168,9 +180,12 @@ export default {
         plateThicknessBottom: '',
         plateThicknessEdge: '',
         tarpaulinSlide: '',
+        tarpaulinSlideKey: '',
         refrigerator: '',
         selfUnHyCoPl: '',
+        selfUnHyCoPlKey: '',
         floorHeating: '',
+        floorHeatingKey: '',
         useOrgSid: '',
         createOrgSid: ''
       },
@@ -225,6 +240,21 @@ export default {
           this.plateMaterial_list = res.data
         }
       })
+      typeValues({ type: 'sz_pbhd' }).then((res) => {
+        if (res.success) {
+          this.tarpaulinSlide_list = res.data
+        }
+      })
+      typeValues({ type: 'sz_zxyygb' }).then((res) => {
+        if (res.success) {
+          this.selfUnHyCoPl_list = res.data
+        }
+      })
+      typeValues({ type: 'sz_dbjr' }).then((res) => {
+        if (res.success) {
+          this.floorHeating_list = res.data
+        }
+      })
     },
     changeInstallName(value) {
       let bb = null
@@ -295,9 +325,69 @@ export default {
       this.formobj.plateMaterialValue = bb.name
       this.formobj.plateMaterialKey = bb.key
     },
+    changeTarpaulinSlide(value) {
+      const choose = this.tarpaulinSlide_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.tarpaulinSlide = choose[0].dictValue
+        this.formobj.tarpaulinSlideKey = choose[0].dictKey
+      }
+    },
+    clearTarpaulinSlide() {
+      this.formobj.tarpaulinSlide = ''
+      this.formobj.tarpaulinSlideKey = ''
+    },
+    changeSelfUnHyCoPl(value) {
+      const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.selfUnHyCoPl = choose[0].dictValue
+        this.formobj.selfUnHyCoPlKey = choose[0].dictKey
+      }
+    },
+    clearSelfUnHyCoPl() {
+      this.formobj.selfUnHyCoPl = ''
+      this.formobj.selfUnHyCoPlKey = ''
+    },
+    changeFloorHeating(value) {
+      const choose = this.selfUnHyCoPl_list.filter((item) => item.dictKey === value)
+      if (choose.length > 0) {
+        this.formobj.floorHeating = choose[0].dictValue
+        this.formobj.floorHeatingKey = choose[0].dictKey
+      }
+    },
+    clearFloorHeating() {
+      this.formobj.floorHeating = ''
+      this.formobj.floorHeatingKey = ''
+    },
     handleReturn(isreload) {
       if (isreload === 'true') this.$emit('reloadlist')
-      this.formobj = {}
+      this.formobj = {
+        sid: '',
+        vehicleTypeKey: '',
+        vehicleTypeValue: '',
+        installNameKey: '',
+        installNameValue: '',
+        refitMethodKey: '',
+        refitMethodValue: '',
+        refitFactory: '',
+        colorKey: '',
+        colorValue: '',
+        wk_long: '',
+        wk_wide: '',
+        wk_high: '',
+        plateMaterialKey: '',
+        plateMaterialValue: '',
+        plateThicknessBottom: '',
+        plateThicknessEdge: '',
+        tarpaulinSlide: '',
+        tarpaulinSlideKey: '',
+        refrigerator: '',
+        selfUnHyCoPl: '',
+        selfUnHyCoPlKey: '',
+        floorHeating: '',
+        floorHeatingKey: '',
+        useOrgSid: '',
+        createOrgSid: ''
+      }
       this.$refs['form_obj'].resetFields()
       this.$emit('doback')
     },