前端问题修改

sgzb-ui/src/views/claimAndRefund/receive/agreement.vue

@@ -141,7 +141,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="往来单位:" prop="unitId" >
+            <el-form-item label="往来单位" prop="unitId" >
               <el-select v-model="form.unitId" filterable  placeholder="请选择往来单位" style="width:100%;">
                 <el-option
                   v-for="item in unitList"
@@ -234,11 +234,11 @@
         </el-row>
        
         <el-row>
-          <el-col :span="12">
+          <el-col :span="20">
             <el-form-item label="合同照片" prop="fileName">
               <el-upload 
                     :http-request="(obj) => imgUpLoad(obj,'fileUrl')"
-                    action="#" :limit='1'
+                    action="#" :limit='5'
                     :file-list="fileList"
                     :show-file-list="true"
                     list-type="picture-card"
@@ -318,7 +318,8 @@ export default {
       imageUrl:'',
       imageName:'',
       fileList:[],
-      field101fileList:[],
+      checkUrlList:[],
+      checkUrlNameList:[],
       dialogImageUrl: '',
       dialogVisible: false,
       //上传地址
@@ -418,21 +419,20 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
-       
+      this.fileList = []
+      this.checkUrlList = []
+      this.checkUrlNameList = []
       this.open = true;
-
       this.title = "新建";
     },
     // 图片上传
     imgUpLoad(param,name,index) {
-      console.log(param,'image')
+      // console.log(param,'image')
       param.type = 'ma'
       imgUpLoad(param).then(res => {
         if(res.code == 200) {
-          this.form.fileUrl = res.data.fileUrl;
+          this.checkUrlList.push(res.data.fileUrl)
-          this.form.fileName = res.data.fileName;
+          this.checkUrlNameList.push(res.data.fileName)
-          this.imageUrl = res.data.fileUrl;
-          this.imageName = res.data.fileName;
         }else{
           // this.$msgError(res.msg)
           this.$modal.msgError(res.msg);
@@ -446,10 +446,10 @@ export default {
       console.log("success")
       },
     handleRemove(file, fileList) {
-      console.log(file, fileList);
+      let sum = 0;
-      this.imageUrl = "";
+      this.checkUrlNameList.forEach((item,index) => { if(item == file.name){ sum = index } }); 
-      this.form.fileUrl = "";
+      this.checkUrlNameList.splice(sum, 1);
-      this.form.fileName = "";
+      this.checkUrlList.splice(sum, 1); 
     },
     //图片点击查看
     handlePictureCardPreview(file) {
@@ -477,12 +477,31 @@ export default {
       }
       getAgreementInfoId(param).then(response => {
         this.form = response.data;
+        this.fileList = []
+        this.checkUrlList = []
+        this.checkUrlNameList = []
+        if(response.data.fileUrl!=''){
+          let urlArr = response.data.fileUrl.split(',')
+          let nameArr =  response.data.fileName.split(',')
+          for(let i=0;i<urlArr.length;i++){
+            let obj =  {
+              name:nameArr[i],
+              url:this.uploadUrl+urlArr[i]
+            }
+            this.fileList.push(obj)
+            this.checkUrlList.push(urlArr[i])
+            this.checkUrlNameList.push(nameArr[i])
+          }
+        }
+        
         this.open = true;
         this.title = "编辑";
       });
     },
     /** 提交按钮 */
     submitForm: function() {
+      this.form.fileUrl = this.checkUrlList.join(',');
+      this.form.fileName = this.checkUrlNameList.join(',');
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.agreementId != undefined) {

sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue

@@ -146,7 +146,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" @click="submitForm(1)">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="openOut=false">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -175,7 +175,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer" style="text-align: center">
         <el-button type="primary" @click="submitForm(2)">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="openIn=false">取 消</el-button>
       </div>
     </el-dialog>
 
@@ -416,14 +416,26 @@ export default {
     /** 按钮操作 */
     handleOut(row) {//1
       this.reset();
-      this.form = row;
+      // this.form = row;
+      console.log(row)
+      this.$set(this.form,'unitId',row.unitId)
+      this.$set(this.form,'typeId',row.typeId)
+      this.$set(this.form,'unitName',row.unitName)
+      this.$set(this.form,'typeName',row.typeName)
+      this.$set(this.form,'modelName',row.modelName)
+      this.$set(this.form,'zkNum',row.zkNum)
       console.log(this.form)
       this.openOut = true;
       this.title = "出库";
     },
     handleIn(row) {//2
       this.reset();
-      this.nform = row;
+      // this.nform = row;
+      this.$set(this.nform,'unitId',row.unitId)
+      this.$set(this.nform,'typeId',row.typeId)
+      this.$set(this.nform,'unitName',row.unitName)
+      this.$set(this.nform,'typeName',row.typeName)
+      this.$set(this.nform,'modelName',row.modelName)
       this.openIn = true;
       this.title = "退库";
     },

sgzb-ui/src/views/repairTest/repair/dialogTwoForm.vue

@@ -51,7 +51,7 @@
             </el-form-item>
             <el-form-item
               v-if="index == 0"
-              :prop="'premiumListTwo.' + index + '.supplierId'"
+              :prop="'premiumList.' + index + '.supplierId'"
               label="选择厂家："
               :rules="{
                 message: '请选择厂家',
@@ -175,7 +175,6 @@
               ></el-input>
             </el-form-item>
             <el-form-item
-              :prop="'premiumListTwo.' + index + '.partName'"
               label="配件名称："
             >
               <el-input
@@ -186,7 +185,6 @@
               ></el-input>
             </el-form-item>
             <el-form-item
-              :prop="'premiumList.' + index + '.partType'"
               label="是否收费："
             >
               <el-radio-group style="width: 350px" v-model="domain.partType">
@@ -229,7 +227,6 @@
               }"
             > -->
             <el-form-item
-              :prop="'premiumListTwo.' + index + '.partPrice'"
               label="配件单价(元)："
               label-width="120px"
             >
@@ -241,7 +238,6 @@
               ></el-input>
             </el-form-item>
             <el-form-item
-              :prop="'premiumListTwo.' + index + '.partNum'"
               label="配件数量："
               :rules="{
                 required: false,
@@ -258,7 +254,6 @@
             </el-form-item>
            
             <el-form-item
-              :prop="'premiumListTwo.' + index + '.repairContent'"
               label="维修内容："
             >
               <el-input

sgzb-ui/src/views/repairTest/repair/index.vue

@@ -154,69 +154,15 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" sortable align="center" type="index" />
-      <el-table-column
+      <el-table-column label="维修单号" align="center" prop="repairCode" sortable :show-overflow-tooltip="true"/>
-        label="维修单号"
+      <el-table-column sortable label="退料单位名称" align="center" prop="backUnit" :show-overflow-tooltip="true"/>
-        align="center"
+      <el-table-column sortable label="退料工程名称" align="center" prop="backPro" :show-overflow-tooltip="true"/>
-        prop="repairCode"
+      <el-table-column sortable label="维修机具类型" align="center" prop="type" :show-overflow-tooltip="true"/>
-        sortable
+      <el-table-column sortable label="任务创建人" align="center" prop="createName" :show-overflow-tooltip="true"/>
-        :show-overflow-tooltip="true"
+      <el-table-column sortable label="任务创建时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
-      />
+      <el-table-column sortable label="退料单号" align="center" prop="backCode" :show-overflow-tooltip="true"/>
-      <el-table-column
+      <el-table-column sortable label="维修状态" align="center" prop="repairStatus" :show-overflow-tooltip="true"/>
-        sortable
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
-        label="退料单位名称"
-        align="center"
-        prop="backUnit"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="退料工程名称"
-        align="center"
-        prop="backPro"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="维修机具类型"
-        align="center"
-        prop="type"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="任务创建人"
-        align="center"
-        prop="createName"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="任务创建时间"
-        align="center"
-        prop="createTime"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="退料单号"
-        align="center"
-        prop="backCode"
-        :show-overflow-tooltip="true"
-      />
-      <el-table-column
-        sortable
-        label="维修状态"
-        align="center"
-        prop="repairStatus"
-        :show-overflow-tooltip="true"
-      />
-
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-        width="250"
-      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -278,13 +224,6 @@
             />
           </el-form-item>
           <el-form-item label="类型名称" prop="typeName">
-            <!-- <treeselect
-              style="width: 250px"
-              v-model="dialogQueryParams.typeName"
-              :options="deptList"
-              :normalizer="normalizer"
-              placeholder="请选择类型名称"
-            /> -->
             <selectTree
               ref="mychildDialog"
               style="width: 240px"
@@ -302,19 +241,6 @@
             ></selectTree>
           </el-form-item>
           <el-form-item label="规格型号" prop="type">
-            <!-- <el-input
-              v-model="dialogQueryParams.type"
-              placeholder="请输入规格型号"
-              clearable
-              style="width: 240px"
-            /> -->
-            <!-- <treeselect
-              style="width: 250px"
-              v-model="dialogQueryParams.type"
-              :options="deptTypeList"
-              :normalizer="normalizerType"
-              placeholder="请选择类型名称"
-            /> -->
             <selectTree
               ref="mychildDialogTwo"
               style="width: 240px"

sgzb-ui/src/views/system/user/index.vue

@@ -297,7 +297,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" maxlength="200"></el-input>
             </el-form-item>
           </el-col>
         </el-row>