no message

package-lock.json

@@ -4711,9 +4711,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.13.3",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.3.tgz",
-      "integrity": "sha512-jvS5GLD9sjQVa2a9HFR70BXexbhMQysR8WFIgmOQDxGKGQs4M68lzCMbjlJ/BINVkFqBdLWFCj730NrUNXo0Cg==",
+      "version": "2.13.4",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.13.4.tgz",
+      "integrity": "sha512-V407QMV24BlmzHYsV7/u7/SuzJByPGqmV0ywCi53lwNJ5kf+3YSmgjHK/hjUBKK5vvXT63QRAurp8W5liIQR3g==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

package.json

@@ -18,7 +18,7 @@
     "@turf/turf": "^6.5.0",
     "@vue-office/excel": "^1.3.0",
     "@vue/composition-api": "^1.7.1",
-    "@zjlib/element-plugins": "^2.13.3",
+    "@zjlib/element-plugins": "^2.13.4",
     "@zjlib/element-ui2": "^1.0.3",
     "axios": "0.18.1",
     "chatgpt": "^4.1.2",

src/components/template/template-page-1.vue

@@ -194,6 +194,12 @@ export default {
     this.getZfireParamList()
   },
   methods: {
+    insertionData(...p){
+      this.$refs.zjpage.insertionData(...p)
+    },
+    tableForm(){
+      return this.$refs.zjpage.$refs.tableForm
+    },
     getTimeDay(num = 0) {
       var day2 = new Date()
       if (num > 0) {

src/views/workOrder/workOrderPool/detail.vue

@@ -28,7 +28,6 @@ import OperationDetail from './detailModule/OperationDetail/index.vue'
 import CompletionDetails from './detailModule/CompletionDetails/index.vue'
 import Payment from './detailModule/Payment/index.vue'
 import Evaluation from './detailModule/Evaluation/index.vue'
-// import { getOrderPayOutlayAmount } from '@/api/detailModule'
 export default {
   components: {
     workOrderInfo,
@@ -56,29 +55,7 @@ export default {
       this.orderType = val
     },
     handleClick(tab, event) {
-      // 初始化加载组件数据
-      // 工单类型 orderType
-      // tabs 类型
-      // if (this.valve !== tab.name) {
-      //   this.$nextTick(() => {
-      //     // 支付费用总金额
-      //     const tabs = {
-      //       payFee: () => this.getOrderPayOutlayAmount()
-      //     }
-      //     tabs[tab.name] && tabs[tab.name]()
-
-      //     const callback = this.$refs[tab.name]?.init
-      //     if (callback && typeof callback === 'function') {
-      //       callback(this.id, this.$refs['workOrderInfo']?.orderInfo, this.orderType)
-      //     }
-      //   })
-      // }
-      // this.valve = tab.name
-    },
-    getOrderPayOutlayAmount() {
-      getOrderPayOutlayAmount({ orderBaseId: this.id }).then(res => {
-        this.payAmount = res.data
-      })
+      
     }
   }
 }
@@ -89,7 +66,7 @@ export default {
   height: calc(100vh - 140px) !important;
   overflow: hidden;
 
-  ::v-deep .el-tabs:nth-child(1) {
+  & > ::v-deep .el-tabs:nth-child(1) {
     &>.el-tabs__header:nth-child(1) {
       margin-bottom: 0 !important;
     }

src/views/workOrder/workOrderPool/detailModule/CompletionDetails/index.vue

@@ -1,121 +1,86 @@
 <template>
-  <div>
-    <zj-form-container style="margin-bottom:40px">
-      <!-- 完工明细 -->
-      <zj-form-module v-if="!look" title="完工明细">
-        <zj-table
-          ref="tableEl"
-          :isDrop="true"
-          :columns="completionDetailColumns"
-          :tableData="completionDetailData"
-          :tableAttributes="{
-            border: true
-          }"
-        ></zj-table>
-        <div class="fr">
-          <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :current-page="pageNum"
-            :page-sizes="[10, 20, 30, 50]"
-            :page-size="pageSize"
-            layout="total, sizes, prev, pager, next, jumper"
-            :total="listTotal"
-          ></el-pagination>
-        </div>
-      </zj-form-module>
-      <!-- 内外机条码信息 -->
-      <zj-form-module v-if="look" title="内外机条码信息" class="header_right_btn">
-        <div slot="header" class="btn">
-          <el-button v-if="orderDetailFiles.length" type="primary" size="mini" @click="imgVisible = true"> 预览图片 </el-button>
-        </div>
-        <zj-table
-          ref="tableEl"
-          :isDrop="true"
-          :columns="barcodeColumns"
-          :tableData="barcodeData"
-          :tableAttributes="{
+  <zj-page-container>
+    <zj-page-fill class="neibuview">
+      <zj-form-container style="margin-bottom:40px">
+        <!-- 完工明细 -->
+        <zj-form-module v-if="!look" title="完工明细">
+          <zj-table ref="tableEl" :isDrop="true" :columns="completionDetailColumns" :tableData="completionDetailData"
+            :tableAttributes="{
+              border: true
+            }"></zj-table>
+          <div class="fr">
+            <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="pageNum"
+              :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+              :total="listTotal"></el-pagination>
+          </div>
+        </zj-form-module>
+        <!-- 内外机条码信息 -->
+        <zj-form-module v-if="look" title="内外机条码信息" class="header_right_btn">
+          <div slot="header" class="btn">
+            <el-button v-if="orderDetailFiles.length" type="primary" size="mini" @click="imgVisible = true"> 预览图片
+            </el-button>
+          </div>
+          <zj-table ref="tableEl" :isDrop="true" :columns="barcodeColumns" :tableData="barcodeData" :tableAttributes="{
             border: true
-          }"
-        ></zj-table>
-      </zj-form-module>
-      <!-- 图片采集信息 -->
-      <zj-form-module v-if="look" title="图片采集信息">
-        <div class="imgCJ">
-          <div v-for="(v, i) in orderDetailFiles" :key="i">
-            <el-image
-              v-if="checkFileType(v.filePath) !=='mp4'"
-              style="width: 210px; height: 280px"
-              :src="$imageUrl + v.filePath"
-              :preview-src-list="[$imageUrl + v.filePath]"
-            >
-              <div slot="error" style="height: 100%; display: flex; justify-content: center; align-items: center">
-                <i>暂无图片</i>
+          }"></zj-table>
+        </zj-form-module>
+        <!-- 图片采集信息 -->
+        <zj-form-module v-if="look" title="图片采集信息">
+          <div class="imgCJ">
+            <div v-for="(v, i) in orderDetailFiles" :key="i">
+              <el-image v-if="checkFileType(v.filePath) !== 'mp4'" style="width: 210px; height: 280px"
+                :src="$imageUrl + v.filePath" :preview-src-list="[$imageUrl + v.filePath]">
+                <div slot="error" style="height: 100%; display: flex; justify-content: center; align-items: center">
+                  <i>暂无图片</i>
+                </div>
+              </el-image>
+              <video v-else width="210" height="280" controls>
+                <source :src="$imageUrl + v.filePath" />
+              </video>
+              <div class="imgTitle">
+                {{ v.fileName }}
               </div>
-            </el-image>
-            <video v-else width="210" height="280" controls>
-              <source :src="$imageUrl + v.filePath" />
-            </video>
-            <div class="imgTitle">
-              {{ v.fileName  }}
             </div>
           </div>
-        </div>
-      </zj-form-module>
-      <!-- 其他信息 -->
-      <zj-form-module
-        v-if="look"
-        title="其他信息"
-        label-width="120px"
-        :formData="formData"
-        :formItems="otherFormItems"
-        :column="1"
-      >
-      </zj-form-module>
-    </zj-form-container>
-    <div v-if="look" class="fixBtnStyle">
-      <el-button size="mini" type="info" @click="look = false">关闭</el-button>
-      <el-button v-if="isCancel && $restrict('discardCollectionData')" size="mini" @click="handlerCancelData" type="primary"
-        >作废采集数据</el-button
-      >
-    </div>
-    <el-dialog
-      title="图片预览"
-      :visible.sync="imgVisible"
-      :close-on-click-modal="false"
-      :modal-append-to-body="false"
-      width="50%"
-      top="8vh"
-      @close="imgVisible = false"
-    >
-      <div>
-        <div class="box">
-          <div style="min-height: 200px;" class="flex" v-for="(v, i) in orderDetailFiles" :key="i">
-            <el-image
-            v-if="checkFileType(v.filePath) !=='mp4'"
-            style="width: 720px; height: auto"
-              :src="$imageUrl + v.filePath"
-              :preview-src-list="[$imageUrl + v.filePath]"
-            >
-              <div slot="error" style="width: 720px;height: auto; display: flex; justify-content: center; align-items: center">
-                <i>暂无图片</i>
-              </div>
-            </el-image>
-            <video v-else  width="720" height="960" controls>
-              <source :src="$imageUrl + v.filePath" />
-            </video>
-            <div class="imgTitle" style="    flex: 0 0 200px; margin-right: 20px; color: #f00">
-              {{ v.fileName }}
-              <div style=" margin-top: 20px;">
+        </zj-form-module>
+        <!-- 其他信息 -->
+        <zj-form-module v-if="look" title="其他信息" label-width="120px" :formData="formData" :formItems="otherFormItems"
+          :column="1">
+        </zj-form-module>
+      </zj-form-container>
+      <div v-if="look" class="fixBtnStyle">
+        <el-button size="mini" type="info" @click="look = false">关闭</el-button>
+        <el-button v-if="isCancel && $restrict('discardCollectionData')" size="mini" @click="handlerCancelData"
+          type="primary">作废采集数据</el-button>
+      </div>
+      <el-dialog title="图片预览" :visible.sync="imgVisible" :close-on-click-modal="false" :modal-append-to-body="false"
+        width="50%" top="8vh" @close="imgVisible = false">
+        <div>
+          <div class="box">
+            <div style="min-height: 200px;" class="flex" v-for="(v, i) in orderDetailFiles" :key="i">
+              <el-image v-if="checkFileType(v.filePath) !== 'mp4'" style="width: 720px; height: auto"
+                :src="$imageUrl + v.filePath" :preview-src-list="[$imageUrl + v.filePath]">
+                <div slot="error"
+                  style="width: 720px;height: auto; display: flex; justify-content: center; align-items: center">
+                  <i>暂无图片</i>
+                </div>
+              </el-image>
+              <video v-else width="720" height="960" controls>
+                <source :src="$imageUrl + v.filePath" />
+              </video>
+              <div class="imgTitle" style="    flex: 0 0 200px; margin-right: 20px; color: #f00">
+                {{ v.fileName }}
+                <div style=" margin-top: 20px;">
                   <span v-if="v.fileType == 1">内机条码: {{ v.code }}</span>
                   <span v-if="v.fileType == 3">外机机条码: {{ v.code }}</span>
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-    </el-dialog>
-  </div>
+      </el-dialog>
+    </zj-page-fill>
+  </zj-page-container>
 </template>
 
 <script>
@@ -244,7 +209,7 @@ export default {
       isCancel: false,
       dispatchStatus: '',
       imgVisible: false,
-      status:  null
+      status: null
     }
   },
   computed: {
@@ -273,7 +238,7 @@ export default {
                   查看
                 </el-button>
                 {row.status == 1 ? (
-                  <el-button size="mini" type="text" onClick={async () => {}}>
+                  <el-button size="mini" type="text" onClick={async () => { }}>
                     结算单
                   </el-button>
                 ) : null}
@@ -342,12 +307,12 @@ export default {
                 {row.type == 'ALL'
                   ? '一体机'
                   : row.type == 'INSIDE'
-                  ? '内机'
-                  : row.type == 'OUT'
-                  ? '外机'
-                  : row.type == 'INSIDE_OUT'
-                  ? '一内一外'
-                  : ''}
+                    ? '内机'
+                    : row.type == 'OUT'
+                      ? '外机'
+                      : row.type == 'INSIDE_OUT'
+                        ? '一内一外'
+                        : ''}
               </div>
             )
           }
@@ -367,7 +332,7 @@ export default {
           render: (h, { row, column, $index }) => {
             return (
               <div style="padding-left:6px">
-                {row.mainWorkerName}{row.assistWorkerName?',': ''}{row.assistWorkerName}
+                {row.mainWorkerName}{row.assistWorkerName ? ',' : ''}{row.assistWorkerName}
               </div>
             )
           }
@@ -383,12 +348,12 @@ export default {
                 {row.status == 0
                   ? '未采集'
                   : row.status == 1
-                  ? '已采集'
-                  : row.status == 2
-                  ? '作废'
-                  : row.status == 3
-                  ? '临时保存'
-                  : ''}
+                    ? '已采集'
+                    : row.status == 2
+                      ? '作废'
+                      : row.status == 3
+                        ? '临时保存'
+                        : ''}
               </div>
             )
           }
@@ -464,28 +429,28 @@ export default {
             prop: 'insidePassword'
           }
         },
-        ...(()=>{
-          return [3,4].includes(this.status) ?[{
-          columnAttributes: {
-            label: '图片',
-            prop: ''
-          },
-          render: (h, { row, column, $index }) => {
-            return (
-              <div style="padding-left:6px">
-              <el-image
-              style="width: 210px; height: 280px"
-              src={ row.path ? this.$imageUrl + row.path : ''}
-              preview-src-list={ row.path ? [this.$imageUrl + row.path] : []}
-              >
-              <div slot="error" style="height: 100%; display: flex; justify-content: center; align-items: center">
-                <i>暂无图片</i>
-              </div>
-              </el-image>
-              </div>
-            )
-          }
-        }] : []
+        ...(() => {
+          return [3, 4].includes(this.status) ? [{
+            columnAttributes: {
+              label: '图片',
+              prop: ''
+            },
+            render: (h, { row, column, $index }) => {
+              return (
+                <div style="padding-left:6px">
+                  <el-image
+                    style="width: 210px; height: 280px"
+                    src={row.path ? this.$imageUrl + row.path : ''}
+                    preview-src-list={row.path ? [this.$imageUrl + row.path] : []}
+                  >
+                    <div slot="error" style="height: 100%; display: flex; justify-content: center; align-items: center">
+                      <i>暂无图片</i>
+                    </div>
+                  </el-image>
+                </div>
+              )
+            }
+          }] : []
         })()
 
       ]
@@ -543,19 +508,19 @@ export default {
       return url.substring(url.lastIndexOf('.') + 1)
     },
     //作废采集数据
-    handlerCancelData(){
-       this.$confirm('此操作将作废已采集数据, 是否继续?', '提示', {
-          confirmButtonText: '是',
-          cancelButtonText: '否',
-          type: 'warning',
-          closeOnClickModal:false,
-          closeOnPressEscape:false,
-          showClose:false
-        }).then(() => {
-          this.handlerCancel()
-        }).catch(() => {
+    handlerCancelData() {
+      this.$confirm('此操作将作废已采集数据, 是否继续?', '提示', {
+        confirmButtonText: '是',
+        cancelButtonText: '否',
+        type: 'warning',
+        closeOnClickModal: false,
+        closeOnPressEscape: false,
+        showClose: false
+      }).then(() => {
+        this.handlerCancel()
+      }).catch(() => {
 
-        });
+      });
     },
     async handlerCancel() {
       let params = {
@@ -582,42 +547,42 @@ export default {
       if (orderType == 'INSTALL' || orderType === 'RECOVERY') {
         this.orderDetailId = id //工单采集明细id
         let { data } = await orderInstallOverDetail({ id })
-          const neiji = []
-          const waiji = []
-          const neijiqit = []
-          const waijiqit = []
-          const caiji = []
-          const qit = []
-          const tshjazqrs = []
+        const neiji = []
+        const waiji = []
+        const neijiqit = []
+        const waijiqit = []
+        const caiji = []
+        const qit = []
+        const tshjazqrs = []
         for (let index = 0; index < data.orderDetailFiles.length; index++) {
           const el = data.orderDetailFiles[index]
-            if (el.fileType == 1) {
-              el.code =  data.orderInstallDetailCodes.find(k=>k.type == 1)?.code
-              neiji.push(el)
-            }
-            if (el.fileType == 3) {
-              el.code =  data.orderInstallDetailCodes.find(k=>k.type == 2)?.code
-              waiji.push(el)
-            }
-            if (el.fileType == 4) {
-              neijiqit.push(el)
-            }
-            if (el.fileType == 5) {
-              waijiqit.push(el)
-            }
-            if (![1,3,4,5,21,44].includes(el.fileType)) {
-              caiji.push(el)
-            }
-            if (el.fileType == 21) {
-              qit.push(el)
-            }
-            if(el.fileType == 44){
-              tshjazqrs.push(el)
-            }
+          if (el.fileType == 1) {
+            el.code = data.orderInstallDetailCodes.find(k => k.type == 1)?.code
+            neiji.push(el)
+          }
+          if (el.fileType == 3) {
+            el.code = data.orderInstallDetailCodes.find(k => k.type == 2)?.code
+            waiji.push(el)
+          }
+          if (el.fileType == 4) {
+            neijiqit.push(el)
+          }
+          if (el.fileType == 5) {
+            waijiqit.push(el)
+          }
+          if (![1, 3, 4, 5, 21, 44].includes(el.fileType)) {
+            caiji.push(el)
+          }
+          if (el.fileType == 21) {
+            qit.push(el)
+          }
+          if (el.fileType == 44) {
+            tshjazqrs.push(el)
+          }
         }
-        this.orderDetailFiles = [...neiji,...waiji,...neijiqit,...waijiqit,...caiji,...qit,...tshjazqrs]
-        
-        data.orderInstallDetailCodes.forEach(v=>{
+        this.orderDetailFiles = [...neiji, ...waiji, ...neijiqit, ...waijiqit, ...caiji, ...qit, ...tshjazqrs]
+
+        data.orderInstallDetailCodes.forEach(v => {
           v.insidePassword = data.insidePassword
         })
         this.barcodeData = data.orderInstallDetailCodes
@@ -661,14 +626,29 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.fixBtnStyle{
-  position:fixed;
-  bottom:0;
+.neibuview {
+  box-sizing: border-box;
+  padding-left: 16px;
+
+  ::v-deep .zj-page-fill-scroll {
+    box-sizing: border-box;
+    padding-right: 16px;
+
+    &>div:nth-child(1) {
+      margin-top: 20px;
+    }
+  }
+}
+
+.fixBtnStyle {
+  position: fixed;
+  bottom: 0;
   z-index: 2000;
   padding: 10px 0 30px;
-  width:calc(100vw - 120px);
-  background-color:#fff
+  width: calc(100vw - 120px);
+  background-color: #fff
 }
+
 ::v-deep .header_right_btn {
   .el-card__header {
     div[class='zj-page-container zj-page-container-row'] {
@@ -676,9 +656,11 @@ export default {
     }
   }
 }
+
 .btn {
   float: right;
 }
+
 .flex {
   display: flex;
   flex-direction: row-reverse;
@@ -688,30 +670,35 @@ export default {
   padding-bottom: 30px;
 }
 
-.box{
+.box {
   height: calc(100vh - 84px);
   padding-bottom: 84px;
   overflow-y: auto
 }
-::v-deep .el-dialog__wrapper{
+
+::v-deep .el-dialog__wrapper {
   position: absolute;
   top: 0;
   left: 0;
 }
-::v-deep .el-dialog{
+
+::v-deep .el-dialog {
   margin: 0 auto !important;
   width: 100% !important;
   height: 100% !important;
   overflow: hidden;
 }
+
 .imgCJ {
   display: flex;
   justify-content: flex-start;
   flex-wrap: wrap;
-  > div {
+
+  >div {
     flex: 0 calc((100% - 210px)/6);
     margin-right: 23px;
   }
+
   .imgTitle {
     font-size: 14px;
     margin: 10px 0 20px;

src/views/workOrder/workOrderPool/detailModule/Evaluation/index.vue

@@ -1,21 +1,19 @@
 <template>
-  <zj-form-container>
-    <zj-form-module title="评价信息">
-      <zj-table
-        ref="tableEl"
-        :is-drop="true"
-        :columns="evaluationColumns"
-        :table-data="evaluationData"
-        :table-attributes="{
-          border: true
-        }"
-      />
-    </zj-form-module>
-  </zj-form-container>
+  <zj-page-container>
+    <zj-page-fill class="neibuview">
+      <zj-form-container>
+        <zj-form-module title="评价信息">
+          <zj-table ref="tableEl" :is-drop="true" :columns="evaluationColumns" :table-data="evaluationData"
+            :table-attributes="{
+              border: true
+            }" />
+        </zj-form-module>
+      </zj-form-container>
+    </zj-page-fill>
+  </zj-page-container>
 </template>
 
 <script>
-// import { orderAppraiseList } from '@/api/workOrderEvaluation'
 export default {
   data() {
     return {
@@ -27,126 +25,97 @@ export default {
       return [
         {
           columnAttributes: {
-            label: '工程师信息',
+            label: '产品品牌',
             prop: 'workerName'
           }
         },
         {
           columnAttributes: {
-            label: '用户昵称',
+            label: '产品大类',
             prop: 'userName'
           }
         },
         {
           columnAttributes: {
-            label: '手机号码',
+            label: '产品小类',
             prop: 'userPhone'
           }
         },
         {
           columnAttributes: {
-            label: '产品大类',
+            label: '机型名称',
             prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '评价类型',
-            prop: 'type'
-          },
-          render: (h, { column, row, index }) => {
-            const type= {
-              1:"首次", 2:"24小时内", 3:"24小时外"
-            }[row.type] || ''
-            return (
-              <div style="padding-left:10px">
-                {type}
-              </div>
-            )
+            label: '负责工程师',
+            prop: 'mainName'
           }
         },
-
         {
           columnAttributes: {
-            label: '评价内容',
-            prop: 'appraiseContent',
-            'min-width': 180
+            label: '联系电话',
+            prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '服务商网点说明情况',
-            prop: 'websitRemark',
-            'min-width': 180
+            label: '用户昵称',
+            prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '跟进人',
-            prop: 'rvisitNickName'
+            label: '手机号',
+            prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '总包服务商复核情况',
-            prop: 'reCheckRemark',
-            'min-width': 180
+            label: '评价类型',
+            prop: 'mainName'
           }
         },
-
         {
           columnAttributes: {
-            label: '评价来源',
-            prop: 'sourceText'
+            label: '评价内容',
+            prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '状态',
-            prop: 'appraiseStatus'
-          },
-          render: (h, { column, row, index }) => {
-            const appraiseStatus= {
-              A:"满意", B:"一般", C:"不满意", N:"未评价", O:"其他"
-            }[row.appraiseStatus] || ''
-            return (
-              <div style="padding-left:10px">
-                {appraiseStatus}
-              </div>
-            )
+            label: '评价来源',
+            prop: 'mainName'
           }
         },
         {
           columnAttributes: {
-            label: '创建时间',
-            prop: 'createTime',
-            'min-width': 180
+            label: '评价时间',
+            prop: 'mainName'
           }
-        }
+        },
       ]
     }
   },
   methods: {
-    init(id, params) {
-      this.getOrderAppraiseList(id)
-    },
-    getOrderAppraiseList(id) {
-      orderAppraiseList({
-        pageNum: 1,
-        pageSize: -1,
-        params: [
-          {
-            param: 'a.order_base_id',
-            compare: 'like',
-            value: id
-          }
-        ]
-      }).then(res => {
-        this.evaluationData = res.data.records
-      })
-    }
+
   }
 }
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.neibuview {
+  box-sizing: border-box;
+  padding-left: 16px;
+
+  ::v-deep .zj-page-fill-scroll {
+    box-sizing: border-box;
+    padding-right: 16px;
+
+    &>div:nth-child(1) {
+      margin-top: 20px;
+    }
+  }
+}
+</style>

src/views/workOrder/workOrderPool/detailModule/OperationDetail/index.vue

@@ -1,23 +1,18 @@
 <template>
-  <zj-form-container>
-    <zj-form-module title="操作明细">
-      <zj-table
-        ref="tableEl"
-        :isDrop="true"
-        :columns="operationDetailColumns"
-        :tableData="operationDetailData"
-        :tableAttributes="{
-          border: true
-        }"
-      ></zj-table>
-    </zj-form-module>
-  </zj-form-container>
+  <zj-page-container>
+    <zj-page-fill class="neibuview">
+      <zj-form-container>
+        <zj-form-module title="操作明细">
+          <zj-table ref="tableEl" :columns="operationDetailColumns" :tableData="operationDetailData" :tableAttributes="{
+            border: true
+          }"></zj-table>
+        </zj-form-module>
+      </zj-form-container>
+    </zj-page-fill>
+  </zj-page-container>
 </template>
 
 <script>
-//操作明细--------------------------------------------
-// import { getInstallOperatorList, getRepairOperatorList } from '@/api/detailModule'
-
 export default {
   data() {
     return {
@@ -39,86 +34,45 @@ export default {
             prop: 'content'
           }
         },
-        // {
-        //   columnAttributes: {
-        //     label: '最后操作时间',
-        //     prop: 'updateTime'
-        //   }
-        // },
-        {
-          columnAttributes: {
-            label: '操作人',
-            prop: 'operator'
-          }
-        },
         {
           columnAttributes: {
-            label: '操作网点',
-            prop: 'operateWebsit'
+            label: '操作时间',
+            prop: 'createTime'
           }
         },
         {
           columnAttributes: {
-            label: '反馈结果',
-            prop: 'feedback'
+            label: '操作人',
+            prop: 'operator'
           }
         },
         {
           columnAttributes: {
-            label: '附件',
-            prop: 'fileUrl',
-            width: 100
-          },
-          render: (h, { row, index }) => {
-            return (
-              <div style={{ padding: '0 6px' }}>
-                {row.filePath ? (
-                  <el-button
-                    type="text"
-                    onClick={() => {
-                      window.open(this.$xdocUrl + encodeURIComponent(this.$imageUrl + row.fileUrl))
-                    }}
-                  >
-                    在线查看附件
-                  </el-button>
-                ) : (
-                  '无'
-                )}
-              </div>
-            )
+            label: '操作网点',
+            prop: 'operateWebsit'
           }
         },
-        {
-          columnAttributes: {
-            label: '操作时间',
-            prop: 'createTime'
-          }
-        }
       ]
     }
   },
   methods: {
-    init(id, params) {
-      this.getList(id, this.filterFn(params.orderType))
-    },
-    filterFn(type) {
-      if (type === 'INSTALL' || type === 'RECOVERY') {
-        return getInstallOperatorList
-      } else {
-        return getRepairOperatorList
-      }
-    },
-    getList(id, fn) {
-      fn({
-        orderBaseId: id,
-        pageNum: 1,
-        pageSize: -1
-      }).then(res => {
-        this.operationDetailData = res.data.records
-      })
-    }
+
   }
 }
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.neibuview {
+  box-sizing: border-box;
+  padding-left: 16px;
+
+  ::v-deep .zj-page-fill-scroll {
+    box-sizing: border-box;
+    padding-right: 16px;
+
+    &>div:nth-child(1) {
+      margin-top: 20px;
+    }
+  }
+}
+</style>