Merge branch 'material-ui' of http://192.168.0.56:3000/bonus/bonus-ui into material-ui

src/views/material/ma/type/index.vue

@@ -462,7 +462,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item
-              label="租赁价(元/天)"
+              label="外部租赁价(元/天)"
               prop="rentPrice"
               label-width="120px"
             >
@@ -475,7 +475,41 @@
               />
             </el-form-item>
           </el-col>
-          
+
+        </el-row>
+
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item
+              label="内部租赁价(元/天)"
+              prop="leasePrice"
+              label-width="120px"
+            >
+              <el-input
+                v-model="form.leasePrice"
+                placeholder="请输入"
+                maxlength="20"
+                type="number" :min="0"
+                style="width: 160px"
+              />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="是否试验" prop="isTest">
+              <el-select
+                v-model="form.isTest"
+                filterable
+                placeholder="请选择"
+                style="width: 100%"
+              >
+                <el-option value="0" label="未试验">未试验</el-option>
+                <el-option value="1" label="已试验">已试验</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
         </el-row>
 
         <el-row>
@@ -1008,6 +1042,8 @@ export default {
           this.form.keeperArr = response.data.keeperId.split(",")
         }
         this.form.isCharging = this.form.isCharging + "";
+        this.form.isTest = this.form.isTest + "";
+
         // this.form.houseName = row.houseName;
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
@@ -1033,6 +1069,7 @@ export default {
           this.form.keeperArr = response.data.keeperId.split(",")
         }
         this.form.isCharging = this.form.isCharging + "";
+        this.form.isTest = this.form.isTest + "";
         // this.form.houseName = row.houseName;
         this.form.itemType = row.itemType;
         this.form.materialType = row.materialType;
@@ -1050,10 +1087,10 @@ export default {
       console.log(this.form, "提交参数---");
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if(this.form.keeperArr.length>0){
+          if(this.form.keeperArr != null && this.form.keeperArr.length > 0){
             this.form.keeperId = this.form.keeperArr.join(",")
           }
-          if(this.form.repairerArr.length>0){
+          if(this.form.repairerArr.length != null && this.form.repairerArr.length > 0){
             this.form.repairerId = this.form.repairerArr.join(",")
           }
           if (this.form.typeId != undefined) {