Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into dev

src/components/jimureport/browse.vue

@@ -2,7 +2,7 @@
   <iframe
     :src="url"
     width="100%"
-    style="height: calc(100vh - 100px)"
+    style="height: calc(100vh - 140px)"
     frameborder="0"
     allowfullscreen="true"
   ></iframe>

src/views/salesServiceManagement/return/component/search.vue

@@ -35,6 +35,13 @@
             type: 'input',
             placeholder: ''
           },
+          {
+            label: '售后需求编码:',
+            value: 'demandCode',
+            labelWidth: 100,
+            type: 'input',
+            placeholder: ''
+          },
 
           {
             label: '创建时间:',

src/views/salesServiceManagement/return/index.vue

@@ -32,14 +32,22 @@
         </template>
         <template v-slot:action="{ row }">
           <el-link
-            v-if="row.approvalStatus != 2 && row.approvalStatus != 1&&$hasPermission('eom:aftersalessparepartsreturnapply:save')"
+            v-if="
+              row.approvalStatus != 2 &&
+              row.approvalStatus != 1 &&
+              $hasPermission('eom:aftersalessparepartsreturnapply:save')
+            "
             type="primary"
             :underline="false"
             @click="submit(row)"
             >提交</el-link
           >
           <el-link
-            v-if="row.approvalStatus != 2 && row.approvalStatus != 1&&$hasPermission('eom:aftersalessparepartsreturnapply:update')"
+            v-if="
+              row.approvalStatus != 2 &&
+              row.approvalStatus != 1 &&
+              $hasPermission('eom:aftersalessparepartsreturnapply:update')
+            "
             type="primary"
             :underline="false"
             @click="openEdit(row, 'edit')"
@@ -52,7 +60,11 @@
           >
             <template v-slot:reference>
               <el-link
-                v-if="row.approvalStatus != 2 && row.approvalStatus != 1&&$hasPermission('eom:aftersalessparepartsreturnapply:delete')"
+                v-if="
+                  row.approvalStatus != 2 &&
+                  row.approvalStatus != 1 &&
+                  $hasPermission('eom:aftersalessparepartsreturnapply:delete')
+                "
                 type="danger"
                 icon="el-icon-delete"
                 :underline="false"
@@ -135,10 +147,10 @@
             align: 'center',
             showOverflowTooltip: true,
             formatter: (row) => {
-              if (!row.details) return '';
+              if (!row.detailList?.length) return '';
               let str = '';
-              row.details.map((el, idx) => {
-                if (idx + 1 == row.details.length) {
+              row.detailList.map((el, idx) => {
+                if (idx + 1 == row.detailList.length) {
                   str += el.categoryName;
                 } else {
                   str = str + '' + el.categoryName + ',';
@@ -147,6 +159,13 @@
               return str;
             }
           },
+          {
+            prop: 'demandCode',
+            label: '售后需求编码',
+            align: 'center',
+            showOverflowTooltip: true
+          },
+
           {
             prop: 'approvalStatus',
             label: '审核状态',