前端问题修改2

sgzb-ui/src/views/base/assetAttributeAllocation/index.vue

@@ -6,7 +6,7 @@
         <div class="head-container">
           <el-input
             v-model="bindingName"
-            placeholder="请输入部门名称"
+            placeholder="请输入资产属性"
             clearable maxlength="50"
             size="small"
             @input="getTree"

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

@@ -343,7 +343,7 @@ export default {
 
     this.GetDeviceTypeTree()
     // this.getList();
-    if(this.$route.query.taskId){
+    if(this.$route.query.taskId&&!this.$route.query.isBack){
       this.GetTaskDetail(this.$route.query.taskId)
     }
     if(this.$route.query.taskId&&this.$route.query.isBack){

sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue

@@ -149,8 +149,8 @@ export default {
   methods: {
     init() {
       let params = {
-        taskId: this.rowObj.taskId,
-        agreementId: this.rowObj.agreementId
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementIdid
       }
       materialReturnNoteByApply(params).then(res => {
         this.tableData = res.data

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

@@ -588,7 +588,9 @@ export default {
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      getRepairTaskListApi(this.addDateRange(this.queryParams, this.dateRange)).then(
+      this.queryParams.startTime = this.dateRange[0]
+      this.queryParams.endTime = this.dateRange[1]
+      getRepairTaskListApi(this.queryParams).then(
         (response) => {
           this.typeList = response.rows;
           this.total = response.total;
@@ -711,7 +713,7 @@ export default {
         type: this.dialogQueryParams.type,
       }
       // this.loading = true;
-      getRepairMaTypeListApi(this.addDateRange(params)).then(res => {
+      getRepairMaTypeListApi(params).then(res => {
         if (res.code == 200) {
           this.repairList = res.rows;
           this.dialogTotal = res.total;

sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue

@@ -48,6 +48,7 @@
           <span v-if="scope.row.taskStatus=='26'">已验收合格</span>
           <span v-if="scope.row.taskStatus=='28'">已入库</span>
           <span v-if="scope.row.taskStatus=='105'">待审核</span>
+          <span v-if="scope.row.taskStatus=='106'">已驳回</span>
         </template>
       </el-table-column>