合并分支 'feature_dev_20221125_YW' 到 'master'

Feature dev 20221125 yw

查看合并请求 laws-nio/laws-weilai!257

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -565,8 +565,7 @@
             <!--        一位小数    -->
             <div v-else-if="item.controlVerify == '6'">
               <a-input-number class="box-input inputWid add--number"
-                              :max="99999"
-                              :precision="1"
+                              :max="99999" :precision="1"
                               :placeholder="$t('pleaseEnter')+$t('OneDecimalPlace')"
                               v-model="item.dataValue"/>
             </div>

jero-web/src/components/tableCollection/index.vue

@@ -640,6 +640,7 @@
         }
         let params = {
           paramsManifestId: paramsManifestid,
+          projectName:this.$route.query.projectName,
           flag: '7'
         }
         getAction(url, params).then((res) => {
@@ -649,8 +650,10 @@
             let num = 0
             this.content = []
             jsonHead.forEach((res, index) => {
+              console.log(res)
               // 配置列
               if (res.type) {
+                console.log('配置')
                 this.columns.push({
                   dataIndex: res.db_field_name,
                   align: 'center',
@@ -834,7 +837,12 @@
                 Object.keys(Obj).forEach((item) => {
                   if (Obj[item] instanceof Object && Obj[item].controlType !== undefined) {
                     Obj[item].list.forEach((itemLi) => {
-                      itemLi.isLock = 1
+                      console.log(item)
+                      if((this.currentPersonRole == 'homo' || this.currentPersonRole == 'admin') && item == 'referencesCol'){
+                        itemLi.isLock = 0
+                      }else{
+                        itemLi.isLock = 1
+                      }
                       if (itemLi.type === 'pull_more') {
                         itemLi.dataValue = !itemLi.dataValue ? [] : itemLi.dataValue.split(',')
                       }

jero-web/src/components/tableCollection/index1.vue

@@ -28,6 +28,15 @@
 
           <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
         </span>
+        <span slot="RemarkDescription" slot-scope="text,record">
+              <a-input class="box-input inputWid"
+                       :maxLength="2000"
+                       :placeholder="$t('pleaseEnter')"
+                       v-model="record.remarks"/>
+        </span>
+        <template slot="Operation" slot-scope="text, record">
+          <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
+        </template>
         <span slot="paramsName" slot-scope="text,record">
             <span class="textName" :title="text">{{text}}</span>
         </span>
@@ -148,6 +157,46 @@
         </div>
       </div>
     </a-modal>
+<!--    历史记录-->
+    <a-modal
+      :title="$t('historicalrecord')"
+      :width="900"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-table
+        class="table"
+        :columns="columnshistory"
+        :pagination="false"
+        :scroll="{y: 400}"
+        :data-source="dataSourcehistory"
+        :loading="loading"
+      >
+       <span slot="content" slot-scope="text,record">
+          <a-tooltip placement="topLeft">
+        <template slot="title">
+          <span v-html="text"></span>
+        </template>
+            <span v-html="text"></span>
+      </a-tooltip>
+       </span>
+      </a-table>
+      <div class="page" v-if="dataSourcehistory.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+    </a-modal>
   </div>
 </template>
 
@@ -235,11 +284,14 @@
         indeterminate: false,
         columns: [],
         content: [],
+        detailDateList: [],
         selectedRowKeys: [],
         selectedRowrowValue: [],
         dataSource: [],
         pageNo: 1,
         pageSize: 100,
+        pageNohistory: 1,
+        pageSizehistory: 10,
         pageSizeOptions: ['100', '200'],
         total: 0,
         searchParmes: {},
@@ -250,7 +302,10 @@
         sdt: 0, // 工程接口人
         dre: 0, // 填写人
         areaVisible: false,
+        visible: false,
         seeVisibleView: false,
+        confirmLoading: false,
+        paramsReportDetailId:'',
         form: {},
         rules: {
           querySdt: [
@@ -273,7 +328,24 @@
         Dateline: {},
         getquerySdtId: '', // 当前工程接口人的id
         areaVisibleView: false, // 查看配置得弹框
-        configDetail: {} // 查看配置得详细信息
+        configDetail: {}, // 查看配置得详细信息
+        dataSourcehistory:[],
+        columnshistory: [
+          {
+            title: this.$t('OperationDetails'),
+            dataIndex: 'logContent',
+            align: 'center',
+            ellipsis: true,
+            scopedSlots: { customRender: 'content' }
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            ellipsis: true,
+            width: 180
+          }
+        ]
       }
     },
     mounted() {
@@ -298,7 +370,6 @@
         }
       },
       onClickTitle(val) {
-        console.log(val)
         this.description = val.description
         this.seeVisibleView = true
 
@@ -525,6 +596,16 @@
                     customRender: 'ParameterDescription'
                   }
                 }
+                if (res.click3) {
+                  this.columns[index].scopedSlots = {
+                    customRender: 'RemarkDescription'
+                  }
+                }
+                if (res.click4) {
+                  this.columns[index].scopedSlots = {
+                    customRender: 'Operation'
+                  }
+                }
                 if (res.db_field_name == 'paramsName') {
                   this.columns[index].width = 300
                   this.columns[index].ellipsis = false
@@ -681,6 +762,7 @@
         })
       },
       onChange(page, pageSize) {
+
       },
       onSelectChange(value, rowValue) {
         this.selectedRowKeys = []
@@ -693,6 +775,44 @@
       OperationClick(ol, item) {
         // this.$emit(ol.ClickEvent, item)
       },
+      UpdateLog(val) {
+        this.visible = true
+        this.paramsReportDetailId = val.id
+        this.bussLogList(val)
+      },
+      bussLogList(val) {
+        let query = {
+          pageNo: this.pageNohistory,
+          pageSize: this.pageSizehistory,
+          paramsReportDetailId: this.paramsReportDetailId
+        }
+        this.loading = true
+        getAction('report/detailLog/page', query).then((res) => {
+          if (res.success) {
+            this.dataSourcehistory = res.result.records
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      handleOk() {
+        this.visible = false
+      },
+      handleCancel() {
+        this.visible = false
+      },
+      onChangehistory(page, pageSize) {
+        console.log(1)
+        this.pageNohistory = page
+        this.bussLogList()
+      },
+      SizeChangehistory(page, pageSize) {
+        this.pageNo = 1
+        this.pageSizehistory = pageSize
+        this.bussLogList()
+      },
       detailClick(item, index) {
         // this.$emit('detailClick', item)
       }
@@ -716,6 +836,11 @@
   }
 </style>
 <style scoped lang="less">
+.inputWid {
+  min-width: 100px;
+  height: 38px;
+  display: inline-block;
+}
   .box {
     width: 100%;
     height: calc(100% - 100px);