Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-ui/src/views/guakaogongsi/guakaogongsiguanli/guakaogongsiAdd.vue

@@ -43,10 +43,10 @@
         </el-row>
         <el-row>
           <el-col :span="4" class="tleftb">
-            <span><span style="color: red">*</span>注册地址</span>
+            <span>注册地址</span>
           </el-col>
           <el-col :span="20"> <!--@change="getShen" @change="getShen" @change="getQu"-->
-            <el-form-item prop="registDetailAddress">
+            <el-form-item>
               <!--              <el-select v-model="registProvinceSid" filterable placeholder="请选择省" class="filter-item" style="width:12%"-->
               <!--                         @change="getShen">-->
               <!--                <el-option v-for="item in inputProvinceList" :key="item.sid" :label="item.name" :value="item.sid"/>-->
@@ -59,7 +59,7 @@
               <!--                         @change="getQu">-->
               <!--                <el-option v-for="item in inputCountyList" :key="item.sid" :label="item.name" :value="item.sid"/>-->
               <!--              </el-select>-->
-              <el-input v-model="temp.registDetailAddress" maxlength="125" placeholder="请填写详细地址" style="width:63%" clearable/> <!-- temp.registDetailAddress -->
+              <el-input v-model="temp.registDetailAddress" maxlength="125" placeholder="请填写详细地址" style="width:63%" clearable/>
             </el-form-item>
           </el-col>
         </el-row>

anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue

@@ -158,9 +158,10 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="备注" header-align="center" width="200">
+            <el-table-column label="备注" header-align="center" width="300">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+                <el-input v-model="scope.row.remarks" class="addinputw" v-if="scope.row.vehicleName.includes('自卸') || scope.row.vehicleName.includes('载货')" placeholder="请填写货箱内部尺寸长*宽*高(mm)" clearable/>
+                <el-input v-model="scope.row.remarks" v-else placeholder="" class="addinputw" clearable/>
               </template>
             </el-table-column>
             <el-table-column label="上装信息" header-align="center" width="180" align="center">
@@ -559,6 +560,11 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' })
             return
           }
+          if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') {
+            var aa = i + 1
+            this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型为自卸或载货，则备注不能为空' })
+            return
+          }
         }
       }
       this.getUrl()

anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue

@@ -157,9 +157,10 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column label="备注" header-align="center" width="200">
+            <el-table-column label="备注" header-align="center" width="300">
               <template slot-scope="scope">
-                <el-input v-model="scope.row.remarks" placeholder="" class="addinputw" clearable/>
+                <el-input v-model="scope.row.remarks" class="addinputw" v-if="scope.row.vehicleName.includes('自卸') || scope.row.vehicleName.includes('载货')" placeholder="请填写货箱内部尺寸长*宽*高(mm)" clearable/>
+                <el-input v-model="scope.row.remarks" v-else placeholder="" class="addinputw" clearable/>
               </template>
             </el-table-column>
             <el-table-column label="上装信息" header-align="center" width="180" align="center">
@@ -542,6 +543,11 @@ export default {
             this.$message({ showClose: true, type: 'error', message: '请检查采购车型列表中车辆型号不能为空' })
             return
           }
+          if ((this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('自卸') || this.formobj.busVehicleApplyDetailList[i].vehicleName.includes('载货')) && this.formobj.busVehicleApplyDetailList[i].remarks === '') {
+            var aa = i + 1
+            this.$message({ showClose: true, type: 'error', message: '采购车型列表中序号' + aa + '的车型为自卸或载货，则备注不能为空' })
+            return
+          }
         }
       }
       this.getUrl()