From dbb71de4cd00a28b38b65f00bf5ed696f48b372f Mon Sep 17 00:00:00 2001
From: jxj_yjl <1490736767@qq.com>
Date: Mon, 29 May 2023 13:46:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E6=B6=A6=E9=A1=B9=E7=9B=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/company/project.js          |   2 +-
 src/assets/js/http.js                         |   8 +-
 src/store/index.js                            |  28 +-
 .../contractManagement/basicInformation.vue   |  10 +-
 .../inOutboundManagement/departmentTeam.vue   |  10 +
 .../inspectionWarehousing.vue                 |   9 +-
 .../inOutboundManagement/materialOutbound.vue |  67 +--
 .../inOutboundManagement/operationalUnit.vue  |   9 +
 .../inOutboundManagement/returnManagement.vue |  31 +-
 .../biddingManagement.vue                     |  36 +-
 .../projectFront/towerCrane/basicInfo.vue     |  25 ++
 .../projectFront/towerCrane/reportForm.vue    |  13 +-
 .../towerCrane/wireRopeMonitoring.vue         | 380 ++++++++++++++++++
 .../entryRegistration.vue                     |   2 +-
 14 files changed, 551 insertions(+), 79 deletions(-)
 create mode 100644 src/views/projectFront/towerCrane/wireRopeMonitoring.vue

diff --git a/src/assets/js/api/company/project.js b/src/assets/js/api/company/project.js
index ac83c9bd..3f023492 100644
--- a/src/assets/js/api/company/project.js
+++ b/src/assets/js/api/company/project.js
@@ -49,4 +49,4 @@ export const getProjectEnterpriseApi = data => post('xmgl/projectEnterprise/sele
 
 
 //金林湾视频
-export const getPlayUrlFromHikvisionApi = data => get('/xmgl/videoItem/getPlayUrlFromHikvision', data); //获取项目下所有合作单位
+export const getPlayUrlFromHikvisionApi = data => get('/xmgl/videoItem/getPlayUrlFromHikvision', data); 
diff --git a/src/assets/js/http.js b/src/assets/js/http.js
index 3791490e..f5290567 100644
--- a/src/assets/js/http.js
+++ b/src/assets/js/http.js
@@ -83,12 +83,12 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://192.168.34.221:30000' //中建五局郭圣雄本地
   // axios.defaults.baseURL = 'http://101.43.164.214:11111' //百色线上
   // axios.defaults.baseURL = 'http://101.43.164.214:12345/'//内蒙古线上
-  axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
+  // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
   // axios.defaults.baseURL = 'http://182.90.224.147:15551/'//港投(成润)项目线上(1)
   // axios.defaults.baseURL = 'http://182.90.224.147:30262/'//港投(成润)项目线上(2)
-    // axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
+    axios.defaults.baseURL ='http://182.90.224.147:100/' //演示平台/
     // axios.defaults.baseURL ='http://192.168.34.221:8070' //郭圣雄本地
     // axios.defaults.baseURL ='http://192.168.34.221:12350/' //金林湾本地
 
@@ -97,8 +97,8 @@ if (process.env.NODE_ENV == 'development') {
   axios.defaults.baseURL = 'https://www.ceshi.com'
 } else if (process.env.NODE_ENV == 'production') {
   let host = window.location.host
-  axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
-  // axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
+  // axios.defaults.baseURL = window.location.protocol + '//' + host + '/api/'//金林湾地址
+  axios.defaults.baseURL = window.location.protocol + '//' + host + '/'
   // axios.defaults.baseURL ='http://192.168.34.216:6023/'
   // axios.defaults.baseURL = window.location.protocol + "//" + host.split(":")[0] + ":6023" + "/"
   // axios.defaults.baseURL = 'http://zhgd.loganwy.com/`'
diff --git a/src/store/index.js b/src/store/index.js
index 66cd9107..fdbdd31c 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -45,9 +45,9 @@ export default new Vuex.Store({
     PAGESIZRS: [10, 20, 30, 50],
     // UPLOADURL:'http://10.0.1.43:6023/upload/image',//测试
     // FILEURL:'http://10.0.1.43:6023/image/',//测试
-    // BASEURL: baseUrl
-    //   ? baseUrl
-    //   : window.location.protocol + "//" + window.location.host + "/", //正式环境
+    BASEURL: baseUrl
+      ? baseUrl
+      : window.location.protocol + "//" + window.location.host + "/", //正式环境
     // UPLOADURL:
     //   window.location.protocol +
     //   "//" +
@@ -55,15 +55,15 @@ export default new Vuex.Store({
     //   "/upload/image", //正式环境
     // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
     //---------------------------------------------------------------------------------------------
-    BASEURL: baseUrl
-      ? baseUrl
-      : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 
-    UPLOADURL:
-      window.location.protocol +
-      "//" +
-      window.location.host +
-      "/api/upload/image", //金林湾部署地址
-    FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 
+    // BASEURL: baseUrl
+    //   ? baseUrl
+    //   : window.location.protocol + "//" + window.location.host + "/api/", //金林湾部署地址 
+    // UPLOADURL:
+    //   window.location.protocol +
+    //   "//" +
+    //   window.location.host +
+    //   "/api/upload/image", //金林湾部署地址
+    // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //金林湾部署地址 
     // FILEURL: 'http://182.90.224.237:7000/image/', // UPLOADURL: 'http://182.90.224.237:7000/upload/image',
     // tag: 本地测试接口 // BASEURL:'http://192.168.34.174:6023/',
     /* 2022-05-16 */
@@ -95,8 +95,8 @@ export default new Vuex.Store({
     // FILEURL: 'http://101.43.164.214:12345/image/',//内蒙古
     // UPLOADURL: 'http://42.194.144.62:8088/upload/image',//中建四
     // FILEURL: 'http://42.194.144.62:8088/image/',//中建四   
-    // UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润
-    // FILEURL: 'http://182.90.224.147:15551/image/',//四川成润
+    UPLOADURL: 'http://182.90.224.147:15551/upload/image',//四川成润
+    FILEURL: 'http://182.90.224.147:15551/image/',//四川成润
 
     ACCOUNTTYPE: [
       "系统管理员",
diff --git a/src/views/projectFront/contractManagement/basicInformation.vue b/src/views/projectFront/contractManagement/basicInformation.vue
index 384cc79e..29914a96 100644
--- a/src/views/projectFront/contractManagement/basicInformation.vue
+++ b/src/views/projectFront/contractManagement/basicInformation.vue
@@ -164,9 +164,10 @@
 
           <el-form-item label="合同金额（元）" prop="contractAmount" label-width="120px !important" >
             <el-input
+            type="number"
             @change="checkValue()"
               v-model="baseInfoFrom.contractAmount"
-              :placeholder="$t('message.companyDiagram.PleaseEnter')"
+              placeholder="请输入数字类型"
             ></el-input>
           </el-form-item>
 
@@ -761,7 +762,7 @@
             >
             </el-table-column>
             <el-table-column
-              label="发票金额（￥）"
+              label="发票金额（元）"
               prop="invoiceAmount"
               align="center"
             >
@@ -1110,10 +1111,11 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="发票金额（￥）" prop="invoiceAmount">
+          <el-form-item label="发票金额（元）" prop="invoiceAmount">
             <el-input
+            type="number"
             v-model="invoiceFrom.invoiceAmount"
-              placeholder="请输入"
+              placeholder="请输入数字类型"
             ></el-input>
           </el-form-item>
           <el-form-item label="状态" prop="status">
diff --git a/src/views/projectFront/inOutboundManagement/departmentTeam.vue b/src/views/projectFront/inOutboundManagement/departmentTeam.vue
index 6bd246f8..677619b3 100644
--- a/src/views/projectFront/inOutboundManagement/departmentTeam.vue
+++ b/src/views/projectFront/inOutboundManagement/departmentTeam.vue
@@ -120,6 +120,7 @@
           </el-form-item>
           <el-form-item label="班组长电话" prop="teamLeaderPhone">
             <el-input
+              maxlength="11"
               v-model="addEditForm.teamLeaderPhone"
               placeholder="请输入"
             ></el-input>
@@ -153,6 +154,9 @@
   </div>
 </template>
 <script>
+import {
+  checkPhone,
+} from "@/assets/js/util.js";
 import {
   addGtMaterialDepartmentTeamApi,
   delGtMaterialDepartmentTeamApi,
@@ -213,6 +217,12 @@ export default {
       this.addEditForm = JSON.parse(JSON.stringify(obj))
     },
     submit() {
+      if (!checkPhone(this.addEditForm.teamLeaderPhone)) {
+        this.$message.error(
+          '请输入正确的联系电话'
+        );
+        return;
+      }
       let params = JSON.parse(JSON.stringify(this.addEditForm))
       params.projectSn = this.$store.state.projectSn
       this.$refs.addEditForm.validate((valid) => {
diff --git a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
index b70b51af..616ebed9 100644
--- a/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
+++ b/src/views/projectFront/inOutboundManagement/inspectionWarehousing.vue
@@ -108,7 +108,7 @@
         <el-table-column
           prop="vendorName"
           align="center"
-          label="供应商"
+          label="供货单位"
         ></el-table-column>
         <el-table-column
           prop="handler"
@@ -326,6 +326,8 @@
             <el-table-column prop="quantity" label="数量" align="center">
               <template slot-scope="scope">
                 <el-input
+                placeholder="请输入数字类型"
+                type="number"
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.quantity"
@@ -335,6 +337,8 @@
             <el-table-column prop="unitPrice" label="单价(元)" align="center">
               <template slot-scope="scope">
                 <el-input
+                placeholder="请输入数字类型"
+                type="number"
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.unitPrice"
@@ -344,6 +348,8 @@
             <el-table-column prop="amount" label="金额(元)" align="center">
               <template slot-scope="scope">
                 <el-input
+                placeholder="请输入数字类型"
+                type="number"
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.amount"
@@ -786,6 +792,7 @@ export default {
       this.addForm = JSON.parse(JSON.stringify(obj))
       this.gtMaterialInOutWarehouseId = obj.id
       this.getMaterialData()
+      this.getListSelect()
     },
     saveContractInfoFn() {
       let params = JSON.parse(JSON.stringify(this.addForm))
diff --git a/src/views/projectFront/inOutboundManagement/materialOutbound.vue b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
index 38328439..2d1d794b 100644
--- a/src/views/projectFront/inOutboundManagement/materialOutbound.vue
+++ b/src/views/projectFront/inOutboundManagement/materialOutbound.vue
@@ -324,13 +324,19 @@
             height="360"
             style="min-height: auto"
           >
-            <el-table-column prop="name" label="品名" align="center" class="styleSel">
+            <el-table-column
+              prop="name"
+              label="品名"
+              align="center"
+              class="styleSel"
+            >
               <template slot-scope="scope">
                 <el-select
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.name"
                   placeholder="请选择品名"
+                  @focus="inputGetLIst(1)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -341,13 +347,19 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="specification" label="规格" align="center" class="styleSel">
+            <el-table-column
+              prop="specification"
+              label="规格"
+              align="center"
+              class="styleSel"
+            >
               <template slot-scope="scope">
                 <el-select
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.specification"
                   placeholder="请选择规格"
+                  @focus="inputGetLIst(2)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -358,13 +370,19 @@
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="unit" label="单位" align="center" class="styleSel">
+            <el-table-column
+              prop="unit"
+              label="单位"
+              align="center"
+              class="styleSel"
+            >
               <template slot-scope="scope">
                 <el-select
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.unit"
                   placeholder="请选择单位"
+                  @focus="inputGetLIst(3)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -385,13 +403,19 @@
                 ></el-input>
               </template>
             </el-table-column>
-            <el-table-column prop="unitPrice" label="单价（元）" align="center" class="styleSel">
+            <el-table-column
+              prop="unitPrice"
+              label="单价（元）"
+              align="center"
+              class="styleSel"
+            >
               <template slot-scope="scope">
                 <el-select
                   style="width: 122px"
                   size="mini"
                   v-model="scope.row.unitPrice"
                   placeholder="请选择单价"
+                  @focus="inputGetLIst(4)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -458,7 +482,6 @@
             保存
           </el-button>
         </div>
-       
       </div>
     </el-dialog>
     <!--详情弹框-->
@@ -785,21 +808,17 @@ export default {
   },
   methods: {
     //获取所有物料
-    inputGetLIst() {
-      // console.log('type----', type);
-      // if (type == 1) {
-      //   this.showProject1 = true
-      //   this.valType = 'name'
-      // } else if (type == 2) {
-      //   this.showProject2 = true
-      //   this.valType = 'specification'
-      // } else if (type == 3) {
-      //   this.showProject3 = true
-      //   this.valType = 'unit'
-      // } else {
-      //   this.showProject4 = true
-      //   this.valType = 'unitPrice'
-      // }
+    inputGetLIst(type) {
+      console.log('type----', type);
+      if (type == 1) {
+        this.valType = 'name'
+      } else if (type == 2) {
+        this.valType = 'specification'
+      } else if (type == 3) {
+        this.valType = 'unit'
+      } else {
+        this.valType = 'unitPrice'
+      }
       let data = {
         projectSn: this.$store.state.projectSn,
         groupBy: this.valType,
@@ -953,7 +972,7 @@ export default {
       this.addForm = {}
       this.getOperatingUnitList()
       this.getDepartmentList()
-      this.inputGetLIst()
+      // this.inputGetLIst()
     },
 
     edit(obj) {
@@ -970,7 +989,7 @@ export default {
       this.getMaterialData()
       this.getOperatingUnitList()
       this.getDepartmentList()
-      this.inputGetLIst()
+      // this.inputGetLIst()
     },
     saveContractInfoFn() {
       let params = JSON.parse(JSON.stringify(this.addForm))
@@ -1083,9 +1102,7 @@ export default {
   padding: 0 !important;
 }
 
-::v-deep .el-input--suffix{
+::v-deep .el-input--suffix {
   width: 135px;
 }
-
-
 </style>
\ No newline at end of file
diff --git a/src/views/projectFront/inOutboundManagement/operationalUnit.vue b/src/views/projectFront/inOutboundManagement/operationalUnit.vue
index 582bec52..85a94983 100644
--- a/src/views/projectFront/inOutboundManagement/operationalUnit.vue
+++ b/src/views/projectFront/inOutboundManagement/operationalUnit.vue
@@ -145,6 +145,9 @@
   </div>
 </template>
 <script>
+import {
+  checkPhone,
+} from "@/assets/js/util.js";
 import {
   addGtMaterialOperatingUnitApi,
   delGtMaterialOperatingUnitApi,
@@ -205,6 +208,12 @@ export default {
       this.addEditForm = JSON.parse(JSON.stringify(obj))
     },
     submit() {
+      if (!checkPhone(this.addEditForm.contactNumber)) {
+        this.$message.error(
+          '请输入正确的联系电话'
+        );
+        return;
+      }
       let params = JSON.parse(JSON.stringify(this.addEditForm))
       params.projectSn = this.$store.state.projectSn
       this.$refs.addEditForm.validate((valid) => {
diff --git a/src/views/projectFront/inOutboundManagement/returnManagement.vue b/src/views/projectFront/inOutboundManagement/returnManagement.vue
index a3672230..b69c8d30 100644
--- a/src/views/projectFront/inOutboundManagement/returnManagement.vue
+++ b/src/views/projectFront/inOutboundManagement/returnManagement.vue
@@ -331,6 +331,7 @@
                   size="mini"
                   v-model="scope.row.name"
                   placeholder="请选择品名"
+                  @focus="inputGetLIst(1)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -348,6 +349,7 @@
                   size="mini"
                   v-model="scope.row.specification"
                   placeholder="请选择规格"
+                  @focus="inputGetLIst(2)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -365,6 +367,8 @@
                   size="mini"
                   v-model="scope.row.unit"
                   placeholder="请选择单位"
+                  @focus="inputGetLIst(3)"
+
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -392,6 +396,7 @@
                   size="mini"
                   v-model="scope.row.unitPrice"
                   placeholder="请选择单价"
+                  @focus="inputGetLIst(4)"
                 >
                   <el-option
                     v-for="(item, index) in allProjectData"
@@ -785,21 +790,17 @@ export default {
   },
   methods: {
     //获取所有物料
-    inputGetLIst() {
+    inputGetLIst(type) {
       // console.log('type----', type);
-      // if (type == 1) {
-      //   this.showProject1 = true
-      //   this.valType = 'name'
-      // } else if (type == 2) {
-      //   this.showProject2 = true
-      //   this.valType = 'specification'
-      // } else if (type == 3) {
-      //   this.showProject3 = true
-      //   this.valType = 'unit'
-      // } else {
-      //   this.showProject4 = true
-      //   this.valType = 'unitPrice'
-      // }
+      if (type == 1) {
+        this.valType = 'name'
+      } else if (type == 2) {
+        this.valType = 'specification'
+      } else if (type == 3) {
+        this.valType = 'unit'
+      } else {
+        this.valType = 'unitPrice'
+      }
       let data = {
         projectSn: this.$store.state.projectSn,
         groupBy: this.valType,
@@ -953,7 +954,6 @@ export default {
       this.addForm = {}
       this.getOperatingUnitList()
       this.getDepartmentList()
-      this.inputGetLIst()
     },
 
     edit(obj) {
@@ -970,7 +970,6 @@ export default {
       this.getMaterialData()
       this.getOperatingUnitList()
       this.getDepartmentList()
-      this.inputGetLIst()
     },
     saveContractInfoFn() {
       let params = JSON.parse(JSON.stringify(this.addForm))
diff --git a/src/views/projectFront/procurementManagement/biddingManagement.vue b/src/views/projectFront/procurementManagement/biddingManagement.vue
index f32d7229..1fafab2b 100644
--- a/src/views/projectFront/procurementManagement/biddingManagement.vue
+++ b/src/views/projectFront/procurementManagement/biddingManagement.vue
@@ -50,7 +50,7 @@
         <el-table-column
           prop="tenderDay"
           align="center"
-          label="招采天数"
+          label="招采时间（天）"
         ></el-table-column>
         <el-table-column
           prop="releaseTime"
@@ -60,7 +60,7 @@
         <el-table-column
           prop="planContractAmount"
           align="center"
-          label="计划合同金额"
+          label="计划合同金额（元）"
         ></el-table-column>
         <el-table-column
           prop="state"
@@ -69,11 +69,17 @@
         ></el-table-column>
         <el-table-column prop="remark" label="备注" align="center">
         </el-table-column>
-        <!-- <el-table-column prop="annex" label="附件" align="center">
+        <el-table-column prop="annex" align="center" label="附件">
           <template slot-scope="scope">
-             {{ scope.row.annex}}
+            <el-button
+              @click.stop="download(scope.row.annex)"
+              type="text"
+              size="small"
+              >下载附件</el-button
+            >
           </template>
-        </el-table-column> -->
+        </el-table-column>
+
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <div class="tableBtns" style="margin-left: 10px !important">
@@ -150,7 +156,7 @@
               placeholder="请输入"
             ></el-input>
           </el-form-item>
-          <el-form-item label="招采天数" prop="tenderDay">
+          <el-form-item label="招采时间（天）" prop="tenderDay">
             <el-input
               v-model="addInviteForm.tenderDay"
               placeholder="请输入"
@@ -224,7 +230,7 @@
       :modal-append-to-body="false"
       title="详情"
       :visible.sync="addOrEditDialog"
-      width="1450px"
+      width="1490px"
     >
       <div class="dialog_content">
         <el-form
@@ -247,7 +253,11 @@
           <el-form-item label="招标类型" prop="receivingAddr">
             <el-input disabled v-model="detailData.tenderType"></el-input>
           </el-form-item>
-          <el-form-item label="招采天数" prop="receivingAddr">
+          <el-form-item
+            label="招采时间（天）"
+            prop="receivingAddr"
+            label-width="110px"
+          >
             <el-input disabled v-model="detailData.tenderDay"></el-input>
           </el-form-item>
 
@@ -261,7 +271,11 @@
           <el-form-item label="备注" prop="remarks">
             <el-input disabled v-model="detailData.remark"></el-input>
           </el-form-item>
-          <el-form-item label="计划合同金额" prop="remarks" label-width="100px">
+          <el-form-item
+            label="计划合同金额（元）"
+            prop="remarks"
+            label-width="140px"
+          >
             <el-input
               disabled
               v-model="detailData.planContractAmount"
@@ -311,7 +325,7 @@
             >
               <template slot-scope="scope">
                 <el-button
-                  @click="download(scope.row.businessDocument, 1)"
+                  @click.stop="download(scope.row.businessDocument, 1)"
                   type="text"
                   size="small"
                   >下载附件</el-button
@@ -434,7 +448,7 @@
           </el-table>
         </div>
 
-        <div class="dialog-footer" >
+        <div class="dialog-footer">
           <el-button
             type="primary"
             icon="el-icon-circle-check"
diff --git a/src/views/projectFront/towerCrane/basicInfo.vue b/src/views/projectFront/towerCrane/basicInfo.vue
index e0785ce1..640e06e3 100644
--- a/src/views/projectFront/towerCrane/basicInfo.vue
+++ b/src/views/projectFront/towerCrane/basicInfo.vue
@@ -1304,6 +1304,31 @@
                 </el-form-item>
               </el-form>
             </div>
+            <div class="form-h2" :class="{ 'dark-h2': styleType == 2 }">
+               钢丝绳信息
+              </div>
+              <el-form
+                size="medium"
+                :model="facilityForm"
+                ref="facilityForm3"
+                :rules="rules"
+                label-width="80px"
+                style="padding-left: 20px"
+                class="demo-facilityForm"
+                :inline="true"
+              >
+                <el-form-item
+                label-width="150px"
+                    label="钢丝绳设备id"
+                    prop="ratedWindSpeed"
+                  >
+                    <el-input
+                      v-model="facilityForm.ratedWindSpeed"
+                      placeholder="请输入"
+                    ></el-input>
+                  </el-form-item>
+              </el-form>
+              
             <div style="text-align: center">
               <el-button
                 style="width: 200px; margin: 30px 0 0 200px"
diff --git a/src/views/projectFront/towerCrane/reportForm.vue b/src/views/projectFront/towerCrane/reportForm.vue
index c22f721d..7854a76a 100644
--- a/src/views/projectFront/towerCrane/reportForm.vue
+++ b/src/views/projectFront/towerCrane/reportForm.vue
@@ -18,6 +18,9 @@
                     <!-- 违章数据 -->
                     {{ $t('message.towerCrane.violationData') }}
                 </div>
+                <div class="menu-item" :class="{'active-menu': activeNav == 5}" @click="checkNav(5)">
+                    钢丝绳监测记录
+                </div>
             </div>
         </div>
         <div class="right">
@@ -31,6 +34,7 @@
     import alarmsTable from './alarmsTable.vue'
     import liveDataTable from './liveDataTable.vue'
     import violationData from './violationData.vue'
+    import wireRopeMonitoring from './wireRopeMonitoring.vue'
     export default {
         name: "reportForm",
         props:['sn'],
@@ -45,7 +49,8 @@
             workCycleTable,//工作循环
             alarmsTable,//报警数据
             liveDataTable,//实时数据
-            violationData//违章数据
+            violationData,//违章数据
+            wireRopeMonitoring//钢丝绳监测数据
         },
         created(){
             this.projectSn = this.sn ? this.sn:this.$store.state.projectSn;
@@ -59,9 +64,13 @@
                     this.componentName = liveDataTable
                 } else if(val == 3){
                     this.componentName = workCycleTable
-                } else if(val == 4){
+                } 
+                else if(val == 4){
                     this.componentName = violationData
                 }
+                else if(val == 5){
+                    this.componentName = wireRopeMonitoring
+                }
             }
         }
     }
diff --git a/src/views/projectFront/towerCrane/wireRopeMonitoring.vue b/src/views/projectFront/towerCrane/wireRopeMonitoring.vue
new file mode 100644
index 00000000..cfb2274e
--- /dev/null
+++ b/src/views/projectFront/towerCrane/wireRopeMonitoring.vue
@@ -0,0 +1,380 @@
+<template>
+  <div class="fullHeight whiteBlock">
+    <div style="padding: 15px 15px 0">
+      <el-form
+        :inline="true"
+        ref="searchForm"
+        :model="searchForm"
+        size="medium"
+      >
+        <el-form-item label="设备名称">
+          <el-input
+            v-model="searchForm.lookupCode"
+            placeholder="请输入"
+          ></el-input>
+        </el-form-item>
+          <el-button type="primary" plain @click="getList">{{
+            $t('message.energyManage.waybill.query')
+          }}</el-button>
+          <el-button type="warning" plain @click="refresh">{{
+            $t('message.deviceManage.refresh')
+          }}</el-button>
+          <el-button type="primary" size="medium" @click="add">新增</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="table_wrap whiteBlock">
+      <el-table class="tables" :data="List">
+        <el-table-column
+          prop="lookupCode"
+          label="助查码"
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="vendorName"
+          align="center"
+          label="供应商名称"
+        ></el-table-column>
+        <el-table-column
+          prop="taxpayerIdentificationNumber"
+          align="center"
+          label="纳税人识别号"
+        ></el-table-column>
+        <!-- 单位 -->
+        <el-table-column
+          prop="address"
+          align="center"
+          label="地址"
+        ></el-table-column>
+        <el-table-column prop="contact" label="联系人" align="center">
+        </el-table-column>
+        <el-table-column prop="contactNumber" label="电话" align="center">
+        </el-table-column>
+        <el-table-column prop="mail" label="邮件" align="center">
+        </el-table-column>
+        <el-table-column
+          prop="legalRepresentative"
+          label="法人代表"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="openedBankAccount"
+          label="开户银行"
+          align="center"
+        >
+        </el-table-column>
+        <el-table-column prop="bankAccount" label="银行账号" align="center">
+        </el-table-column>
+        <el-table-column label="操作" align="center">
+          <template slot-scope="scope">
+            <div class="tableBtns">
+              <div @click="edit(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-edit.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.edit') }}</span>
+              </div>
+              <div @click="deleteDev(scope.row)" class="operationText">
+                <img
+                  src="@/assets/images/icon-delete.png"
+                  width="15px"
+                  height="15px"
+                />
+                <span>{{ $t('message.deviceManage.delete') }}</span>
+              </div>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        class="pagerBox"
+        @size-change="SizeChange"
+        @current-change="CurrentChange"
+        :current-page="pagInfo.pageNo"
+        :page-sizes="$store.state.PAGESIZRS"
+        :page-size="pagInfo.pageSize"
+        layout="total, sizes, prev, pager, next"
+        :total="Number(pagInfo.total)"
+        background
+      ></el-pagination>
+    </div>
+    <!-- 新增弹框 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="title"
+      :visible.sync="dialogShow"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="addEditForm"
+          :model="addEditForm"
+          :rules="addEditRules"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          <el-form-item label="助查码" prop="lookupCode">
+            <el-input
+              v-model="addEditForm.lookupCode"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="供应商名称" prop="vendorName">
+            <el-input
+              v-model="addEditForm.vendorName"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item
+            label="纳税人识别号"
+            prop="taxpayerIdentificationNumber"
+          >
+            <el-input
+              v-model="addEditForm.taxpayerIdentificationNumber"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="地址" prop="address">
+            <el-input
+              v-model="addEditForm.address"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系人" prop="contact">
+            <el-input
+              v-model="addEditForm.contact"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="联系电话" prop="contactNumber">
+            <el-input
+              v-model="addEditForm.contactNumber"
+              placeholder="请输入"
+              maxlength="11"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="邮件" prop="mail">
+            <el-input
+              v-model="addEditForm.mail"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="法人代表" prop="legalRepresentative">
+            <el-input
+              v-model="addEditForm.legalRepresentative"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="开户银行" prop="openedBankAccount">
+            <el-input
+              v-model="addEditForm.openedBankAccount"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="银行账号" prop="bankAccount">
+            <el-input
+              v-model="addEditForm.bankAccount"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="dialogShow = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  addGtMaterialVendorApi,
+  deletGtMaterialVendorApi,
+  editGtMaterialVendorApi,
+  gettGtMaterialVendorPageApi
+} from '@/assets/js/api/materialManagement.js'
+import {
+  checkPhone,
+} from "@/assets/js/util.js";
+export default {
+  mounted() {
+    // this.getFeedUnitList()
+    // this.getPurchaseOrderList()
+    this.getList()
+  },
+  data() {
+    return {
+      title: "",
+      dialogShow: false,
+      pagInfo: {
+        pageNo: 1, //页数
+        pageSize: 10, //条数
+        total: 0 //总条数
+      },
+      List: [],
+      addEditForm: {
+        lookupCode: '',
+        vendorName: '',
+        taxpayerIdentificationNumber: '',
+        address: '',
+        contact: '',
+        contactNumber: '',
+        mail: '',
+        legalRepresentative: '',
+        openedBankAccount: '',
+        bankAccount: '',
+      },
+      addEditRules: {},
+      searchForm: {
+        lookupCode: '',
+        vendorName: '',
+        contactNumber: '',
+        taxpayerIdentificationNumber: '',
+        contact: '',
+      },
+    }
+  },
+  methods: {
+    //查询仓库数据
+    getList() {
+      gettGtMaterialVendorPageApi({
+        pageNo: this.pagInfo.pageNo,
+        pageSize: this.pagInfo.pageSize,
+        projectSn: this.$store.state.projectSn,
+        lookupCode: this.searchForm.lookupCode,
+        vendorName: this.searchForm.vendorName,
+        contactNumber: this.searchForm.contactNumber,
+        taxpayerIdentificationNumber: this.searchForm.taxpayerIdentificationNumber,
+        contact: this.searchForm.contact,
+      }).then((result) => {
+        console.log('result====', result);
+        if (result.success) {
+          this.List = result.result.records
+          this.pagInfo.total = result.result.total
+        }
+      })
+    },
+
+    add() {
+      this.title = '新增仓库'
+      this.dialogShow = true
+      this.close()
+    },
+
+    edit(obj) {
+      this.title = '编辑仓库'
+      this.dialogShow = true
+      this.addEditForm = JSON.parse(JSON.stringify(obj))
+    },
+    submit() {
+      if (!checkPhone(this.addEditForm.contactNumber)) {
+        this.$message.error(
+          '请输入正确的联系电话'
+        );
+        return;
+      }
+      let params = JSON.parse(JSON.stringify(this.addEditForm))
+      params.projectSn = this.$store.state.projectSn
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.title == '新增仓库') {
+            addGtMaterialVendorApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          } else if (this.title === '编辑仓库') {
+            console.log('编辑信息', this.addEditForm)
+            editGtMaterialVendorApi(params).then((result) => {
+              if (result.success) {
+                this.$message.success(result.message)
+                this.getList()
+              }
+            })
+          }
+          this.dialogShow = false
+        } else {
+          return false
+        }
+      })
+    },
+    deleteDev(obj) {
+      this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          deletGtMaterialVendorApi({ id: obj.id }).then((res) => {
+            if (res.success) {
+              this.getList()
+              this.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            } else {
+              this.$message({
+                type: "error",
+                message: res.message,
+              });
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
+    },
+
+    close() {
+      this.addEditForm = {}
+      this.$nextTick(() => {
+        this.$refs.addEditForm.clearValidate()
+      })
+    },
+    SizeChange(val) {
+      this.pagInfo.pageSize = val
+      this.getList()
+    },
+    CurrentChange(val) {
+      this.pagInfo.pageNo = val
+      this.getList()
+    },
+    refresh() {
+      this.searchForm = {}
+      this.pagInfo.pageNo = 1 //页数
+      this.pagInfo.pageSize = 10 //条数
+      this.getList()
+    },
+  }
+}
+</script>
+<style lang="less" scoped>
+.tables2 {
+  min-height: auto;
+}
+// .tableBtns {
+//     display: flex;
+//     justify-content: center;
+// }
+</style>
\ No newline at end of file
diff --git a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
index 2e947996..e8d0d6a7 100644
--- a/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
+++ b/src/views/projectFront/turnoverMaterialManagement/entryRegistration.vue
@@ -108,7 +108,7 @@
         <el-table-column
           prop="vendor"
           align="center"
-          label="供应商"
+          label="供货单位"
         ></el-table-column>
         <el-table-column
           prop="handler"