合并

src/api/lease/apply.js

@@ -53,6 +53,16 @@ export function getListUnite(data) {
     data: data,
   })
 }
+
+// 领料申请租赁单位下拉框
+export function getUnitProDepList(data) {
+  return request({
+    url: '/material/select/getUnitProDepList',
+    method: 'post',
+    data: data,
+  })
+}
+
 export function getUnitListLeaseApi(data) {
   return request({
     url: '/material/select/getUnitListLease',

src/api/materialsStation/index.js

@@ -979,3 +979,11 @@ export function getClzTeamListApi(query) {
     params: query
   })
 }
+// 直转单-签名
+export function getSignatureList(data) {
+  return request({
+    url: '/material/directRotation/getSignatureList',
+    method: 'get',
+    params: data
+  })
+}

src/views/business/businessHandling/directApply.vue

@@ -335,7 +335,7 @@
 
 <script>
 import { getMaTypeOpt } from '@/api/ma/base'
-import { getListProject, getListUnite, getAgreement } from '@/api/lease/apply'
+import {getListProject, getListUnite, getAgreement, getUnitProDepList} from '@/api/lease/apply'
 import { downloadFile, downloadFileData } from '@/utils/download'
 import { getUseringData, receiveSubmitTwo, receiveEdit, receiveDetail, getEquipmentThreeTypes } from '@/api/business/index'
 import Treeselect from '@riophae/vue-treeselect'
@@ -824,7 +824,7 @@ export default {
             console.log("kkkkkkkkkkk",this.isEdit)
             if (!this.isEdit) {
                 //转出单位
-                getListUnite({ projectId: null,enableFilter: true }).then(response => {
+              getUnitProDepList({ projectId: null,enableFilter: true }).then(response => {
                     this.uniteList = response.data
                 })
                 //转出工程
@@ -832,7 +832,7 @@ export default {
                     this.projectList = response.data
                 })
                 //转入单位
-                getListUnite({ projectId: null }).then(response => {
+              getUnitProDepList({ projectId: null }).then(response => {
                     this.lessUniteList = response.data
                 })
                 //转入工程
@@ -841,7 +841,7 @@ export default {
                 })
             } else {
                 //转出单位
-                getListUnite({ projectId: null,enableFilter: true }).then(response => {
+              getUnitProDepList({ projectId: null,enableFilter: true }).then(response => {
                     this.uniteList = response.data
                 })
                 //转出工程
@@ -849,7 +849,7 @@ export default {
                     this.projectList = response.data
                 })
                 //转入单位
-                getListUnite({ projectId: null }).then(response => {
+              getUnitProDepList({ projectId: null }).then(response => {
                     this.lessUniteList = response.data
                 })
                 //转入工程

src/views/materialsStation/equipment/safetyWarn/index.vue

@@ -206,7 +206,8 @@
         <template slot-scope="{ row }">
           <span>
             <el-button v-if="row.qrCode" type="text" size="mini" @click="handleSee(row)">查看</el-button>
-            <span v-else>未绑定</span>
+
+            <span v-else>/</span>
           </span>
         </template>
       </el-table-column>