提交已修改修试相关代码bug

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

@@ -17,7 +17,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
       <el-form-item label="单位名称" prop="backUnit">
         <el-select
           v-model="queryParams.backUnit"
@@ -193,7 +192,6 @@
         prop="createTime"
         :show-overflow-tooltip="true"
       />
-
       <el-table-column
         label="报废单号"
         align="center"
@@ -501,10 +499,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
-      defaultData: {
+      defaultData: null,
-        id: '',
-        label: ''
-      },
       selectionList: [],
       unitInfoSelectList: [],
       projectSelectList: [],
@@ -576,6 +571,10 @@ export default {
     })
     this.getTree()
   },
+  updated() {
+    this.$refs.mychild.clearSelect();
+    this.defaultData = null
+  },
   methods: {
     /** 查询字典类型列表 */
     getList() {
@@ -648,12 +647,12 @@ export default {
     getTree() {
       listPartTypeApi().then(response => {
         this.deptList = response.data
-        // this.deptList = this.handleTree(response.data, "id");
       });
       getMaTypeSelectApi().then(response => {
         this.deptTypeList = response.data
       });
     },
+
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -663,6 +662,7 @@ export default {
     resetQuery() {
       this.dateRange = [];
       this.resetForm("queryForm");
+      this.$refs.mychild.clearSelect();
       this.handleQuery();
     },
     /** 新增按钮操作 */

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

@@ -27,7 +27,6 @@
               :prop="'premiumList.' + index + '.partId'"
               label="选择配件："
             >
-              <!---->
               <treeselect
                 v-model="domain.partId"
                 style="width: 250px"
@@ -503,6 +502,7 @@ export default {
               this.fullscreenLoading = false
               this.dialogShowFlag = false
               this.index = null
+              this.$message.success('操作成功!')
               this.$emit('domainChange', res.code)
             }
           }).catch(() => {
@@ -534,6 +534,7 @@ export default {
               this.fullscreenLoading = false
               this.dialogShowFlag = false
               this.index = null
+              this.$message.success('操作成功!')
               this.$emit('domainChange', res.code)
             }
           }).catch(() => {

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

@@ -200,7 +200,7 @@ export default {
   },
   data() {
     return {
-      actionUrl: process.env.VUE_APP_BASE_API + '/system/sys/file/upload',
+      actionUrl: process.env.VUE_APP_BASE_API + '/sgzb-system/sys/file/upload',
       // uploadTip: '只能上传jpg/png文件，且不超过500kb',
       fileIds: [],
       fileList: [],
@@ -285,12 +285,14 @@ export default {
             fileIds: this.fileIds.length > 0 ? this.fileIds : "",
             scrapNum: 1,
           }
+
           this.fullscreenLoading = true
           submitRepairApplyApi(params).then(res => {
             if (res.code == 200) {
               this.fileList = []
               this.fileIds = []
               this.getList()
+              this.$message.success('操作成功!')
               this.fullscreenLoading = false
               this.dialogShowFlag = false
               this.$emit('domainChange', res.code)
@@ -326,6 +328,7 @@ export default {
               this.fileList = []
               this.fileIds = []
               this.getList()
+              this.$message.success('操作成功!')
               this.fullscreenLoading = false
               this.dialogShowFlag = false
               this.$emit('domainChange', res.code)
@@ -364,8 +367,6 @@ export default {
     cancel() {
       this.dialogShowFlag = false;
       this.fileList = []
-      // this.$refs["form"].resetFields();
-      // this.dynamicValidateForm.premiumList = [];
     },
     addDomainOne() {
       this.dynamicValidateForm.premiumList.push({

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

@@ -116,18 +116,6 @@
               ></el-input>
             </el-form-item>
           </div>
-          <!--          <el-button @click.prevent="removeDomain(domain, index)"-->
-          <!--            >删除-->
-          <!--          </el-button>-->
-          <!-- <div class="add_box">
-            <el-button
-              icon="el-icon-plus"
-              size="mini"
-              type="success"
-              @click="addDomainOne"
-              >添加配件
-            </el-button>
-          </div> -->
         </div>
       </el-form>
       <div
@@ -514,6 +502,7 @@ export default {
               this.getList()
               this.fullscreenLoading = false
               this.dialogShowFlag = false
+              this.$message.success('操作成功!')
               this.$emit('domainChange', res.code)
             }
           }).catch(() => {
@@ -545,6 +534,7 @@ export default {
               this.getList()
               this.fullscreenLoading = false
               this.dialogShowFlag = false
+              this.$message.success('操作成功!')
               this.$emit('domainChange', res.code)
             }
           }).catch(() => {

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

@@ -49,7 +49,7 @@
       </el-form-item>
       <el-form-item label="工机具类型" prop="type">
         <selectTree
-          ref="mychild"
+          ref="mychildSon"
           style="width: 240px"
           :treeList="deptList"
           :treeProps="{
@@ -59,12 +59,11 @@
           nodeKey="id"
           :defaultSelect="true"
           :defaultData="defaultData"
-          :clearable="false"
+          :clearable="true"
           :placeholder="'请选择'"
           @handleNodeClick="selectDrop"
         ></selectTree>
       </el-form-item>
-
       <el-form-item label="退料单号" prop="backCode">
         <el-input
           v-model="queryParams.backCode"
@@ -184,7 +183,7 @@
         sortable
         label="任务创建人"
         align="center"
-        prop="createUser"
+        prop="createName"
         :show-overflow-tooltip="true"
       />
       <el-table-column
@@ -295,8 +294,8 @@
               nodeKey="id"
               :defaultSelect="true"
               :defaultData="defaultData"
-              :clearable="false"
+              :clearable="true"
-              :placeholder="'请选择'"
+              :placeholder="'请选择类型名称'"
               @handleNodeClick="selectDropDialog"
             ></selectTree>
           </el-form-item>
@@ -325,8 +324,8 @@
               nodeKey="id"
               :defaultSelect="true"
               :defaultData="defaultData"
-              :clearable="false"
+              :clearable="true"
-              :placeholder="'请选择'"
+              :placeholder="'请选择规格型号'"
               @handleNodeClick="selectDropDialogTwo"
             ></selectTree>
           </el-form-item>
@@ -622,7 +621,7 @@ export default {
       form: {},
       // 表单校验
       rules: {},
-      defaultData: null,
+      defaultData: {},
     };
   },
   created() {
@@ -638,9 +637,12 @@ export default {
   },
   mounted() {
     this.getTree();
-    // this.$refs.mychild.clearSelect();
     this.getList();
   },
+  updated() {
+    this.$refs.mychildSon.clearSelect();
+    this.defaultData = null
+  },
   methods: {
     onClose() {
       this.open = false
@@ -650,6 +652,7 @@ export default {
     },
     selectDrop(value) {
       this.queryParams.type = value
+      this.defaultData = null
     },
     selectDropDialog(value) {
       this.dialogQueryParams.typeName = value
@@ -720,37 +723,32 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
+      this.queryParams.pageSize = 10;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.dictName = ''
+      this.queryParams.type = ''
       this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
-      // this.$refs.mychild.clearFun();
+      this.$refs.mychildSon.clearSelect();
-      this.$refs.mychild.clearSelect();
     },
     /** 重置按钮操作 */
     resetQueryDialog() {
-      this.dialogQueryParams = {};
+      // this.dialogQueryParams = {};
+      this.dialogQueryParams.keyword = ''
+      this.dialogQueryParams.type = ''
+      this.dialogQueryParams.typeName = ''
       this.resetForm("dialogQueryParams");
       this.getDialogList();
       this.$refs.mychildDialog.clearSelect();
       this.$refs.mychildDialogTwo.clearSelect();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "计划借调";
-    },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      console.log('selection', selection);
       this.selectionList = selection
       this.checkResultOne = selection.every(item => item.repairStatusCode == '43');
-      console.log('this.checkResultOne ', this.checkResultOne);
       this.ids = selection.map((item) => item.dictId);
       this.single = selection.length != 1;
       this.multiple = !selection.length;
@@ -778,9 +776,6 @@ export default {
       this.dialogQueryParams = {}
       this.resetForm("dialogQueryParams");
     },
-    showClose() {
-      console.log('11111111111111');
-    },
     getDialogList() {
       let params = {
         taskId: this.taskId,
@@ -799,7 +794,6 @@ export default {
         }
       })
     },
-
     handleReturn() {
       this.title = '确认操作'
       this.openOne = true;

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

@@ -46,7 +46,6 @@
     </el-option>
   </el-select>
 </template>
-
 <script>
 export default {
   name: 'index',

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

@@ -0,0 +1,105 @@
+<template>
+  <div>
+    <div v-clickoutside="closeTree">
+      <div @click="inputFocus">
+        <el-input
+          v-model="inputValue"
+          :style="'width:' + width + 'px'"
+          placeholder="请选择工机具类型"
+        ></el-input>
+      </div>
+      <div class="treeModule">
+        <el-tree
+          class="ORGTree"
+          v-show="ishowTree"
+          ref="tree"
+          :data="dataList"
+          key="id"
+          node-key="id"
+          highlight-current
+          @node-click="handleNodeClick"
+          :props="defaultProps"
+        >
+        </el-tree>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import Clickoutside from "element-ui/src/utils/clickoutside";
+export default {
+  directives: { Clickoutside },
+  props: {
+    dataList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
+    // name: {
+    //   type: String,
+    //   default: ''
+    // },
+    width: {
+      type: Number,
+      default: 300
+    }
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      mineStatusValue: [],
+      inputValue: '',
+      dataLists: [],
+      defaultProps: {
+        children: 'children',
+        label: 'label',
+      },
+      ishowTree: false,
+    }
+  },
+  mounted() {
+  },
+  // watch: {
+  //   name: function () {
+  //     this.inputValue = this.name
+  //   }
+  // },
+  methods: {
+    inputFocus() {
+      if (this.ishowTree == true) {
+        this.ishowTree = false
+      } else {
+        this.ishowTree = true
+      }
+
+    },
+    // 关闭树形控件
+    closeTree() {
+      this.ishowTree = false
+    },
+    handleNodeClick(e) {
+      this.inputValue = e.label
+      this.$emit('changeId', e.id)
+      this.ishowTree = false
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.treeModule {
+  position: absolute; /*这里一定要设置*/
+  z-index: 999999; /*这里是该元素与显示屏的距离，据说越大越好，但是我也没有看到效果，因为没有它也是可以的*/
+}
+.ORGTree {
+  width: 240px;
+  height: 200px;
+  overflow: auto;
+  border: 1px solid #ccc7c7;
+}
+</style>

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

@@ -74,6 +74,7 @@ export default {
     }
   }
 };
+
 </script>
 
 <style scoped>

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

@@ -19,8 +19,6 @@
     >
       <i class="el-icon-plus"></i>
     </el-upload>
-
-    <!-- 上传提示 -->
     <div class="el-upload__tip" slot="tip" v-if="showTip">
       请上传
       <template v-if="fileSize">

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

@@ -59,7 +59,7 @@
           nodeKey="id"
           :defaultSelect="true"
           :defaultData="defaultData"
-          :clearable="false"
+          :clearable="true"
           :placeholder="'请选择'"
           @handleNodeClick="selectDrop"
         ></selectTree>
@@ -299,13 +299,6 @@
             ></selectTree>
           </el-form-item>
           <el-form-item label="规格型号" prop="type">
-            <!-- <treeselect
-              style="width: 250px"
-              v-model="dialogQueryParams.type"
-              :options="deptTypeList"
-              :normalizer="normalizerType"
-              placeholder="请选择类型名称"
-            /> -->
             <selectTree
               ref="mychildDialogTwo"
               style="width: 240px"
@@ -500,10 +493,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
-      defaultData: {
+      defaultData: null,
-        id: '',
-        label: ''
-      },
       selectionList: [],
       unitInfoSelectList: [],
       projectSelectList: [],
@@ -576,8 +566,12 @@ export default {
     })
     this.getTree()
   },
-  methods: {
+  updated() {
+    this.$refs.mychild.clearSelect();
+    this.defaultData = null
+  },
 
+  methods: {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
@@ -665,6 +659,7 @@ export default {
       this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
+      this.$refs.mychild.clearSelect();
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -679,7 +674,6 @@ export default {
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
-
     handleSee(row, type) {
       this.dialogTitle = '查看'
       this.rowObj = row