fix

src/service/warehouse.ts

@@ -24,6 +24,18 @@ export const api_putresource = (parmares:object) => {
   });
 };
 
+export const api_bj = (parmares: object) => {
+  return request<Object>('POST', {
+    url: `/zhdd/incident/backLogFinish`,
+    data: parmares,
+  });
+};
+
+export const api_isbj = (taskid:string) => {
+  return request<Object>('GET', {
+    url: `/zhdd/incident/queryTaskFinish?taskId=${taskid}`,
+  });
+};
 
 
 

src/views/Warehouse/index.vue

@@ -1,8 +1,15 @@
 <template>
   <div>
-    <van-nav-bar title="应急仓库" left-arrow placeholder @click-left="goback" :fixed="true" >
+    <van-nav-bar
+      title="应急仓库"
+      left-arrow
+      placeholder
+      @click-left="goback"
+      :fixed="true"
+      @click-right="bjclick"
+    >
       <template #right>
-        <van-icon name="edit" size="18"  @click="editclick"/>
+        <span v-if="!isbj" class="bjbtn">办结</span>
       </template>
     </van-nav-bar>
     <div v-if="!isempt">
@@ -20,13 +27,13 @@
               v-model="whdata.value.manageUnit"
               label="管理单位"
               input-align="right"
-               :readonly="isedit"
+              :readonly="isedit"
               placeholder="请输入管理单位"
             />
             <van-field
               v-model="whdata.value.contactName"
               required
-               :readonly="isedit"
+              :readonly="isedit"
               label="联系人"
               input-align="right"
               placeholder="请输入联系人"
@@ -35,7 +42,7 @@
               v-model="whdata.value.contactPhone"
               required
               label="联系方式"
-               :readonly="isedit"
+              :readonly="isedit"
               input-align="right"
               placeholder="请输入联系方式"
             />
@@ -99,7 +106,13 @@
       </div>
 
       <div style="padding: 10px 20px">
-        <van-button type="primary" block style="border-radius: 30px" @click="dosavedata">提交</van-button>
+        <van-button
+          type="primary"
+          block
+          style="border-radius: 30px"
+          @click="dosavedata"
+          >提交</van-button
+        >
       </div>
     </div>
     <div><van-empty v-if="isempt" description="无仓库" /></div>
@@ -107,105 +120,160 @@
 </template>
 
 <script setup>
-import { ref, reactive,onUpdated } from "vue";
-import { api_getresource,api_getresourcedetail,api_putresource} from "@/service/warehouse"
-import { Toast,Notify } from 'vant';
+import { ref, reactive, onUpdated,onMounted } from 'vue';
+import { RouterView, useRoute, useRouter } from 'vue-router';
+import {
+  api_getresource,
+  api_getresourcedetail,
+  api_putresource,
+  api_bj,api_isbj
+} from '@/service/warehouse';
+import { Toast, Notify,Dialog } from 'vant';
 
-
-const whdata = reactive({value:{ name: "",manageUnit:"",contactName:"",contactPhone:"" }});
+const whdata = reactive({
+  value: { name: '', manageUnit: '', contactName: '', contactPhone: '' },
+});
 const isedit = ref(true);
 const isempt = ref(true);
 // let  deletwzarr = [];
-const wzdata = reactive({aar:[
-]});
+const wzdata = reactive({ aar: [] });
+
 
+const bjclick = () => {
+  if(isbj.value){
+    return;
+  }
+  Dialog.confirm({
+    title: '提示',
+    confirmButtonText: '办结',
+    message: '确认是否办结?',
+  })
+    .then(() => {
+      // on confirm
+      Toast.loading({
+        message: '加载中...',
+        duration: 0,
+        forbidClick: true,
+      });
+      api_bj({ taskId: route.query.taskid }).then((res) => {
+        Toast.clear();
+        try {
+          Toast.message("成功")
+          uni.navigateBack();
+        } catch (E) {
+           
+        }
+      });
+      Toast.clear();
+    })
+    .catch(() => {
+      // on cancel
+      Toast.clear();
+    });
+};
 const doaddwzClick = () => {
   var wz = {
-    name: "",
-    model: "",
-    size: "",
+    name: '',
+    model: '',
+    size: '',
     num: 0,
-    unit: "",
-    availableNum: "",
+    unit: '',
+    availableNum: '',
   };
   wzdata.aar.push(wz);
 };
-const editclick=()=>{
-    isedit.value = false;
-}
-const deletewz = (index)=>{
-   if(index>=wzdata.aar.length){
-       return;
-   }
-  wzdata.aar.splice(index,1);
-  //  if(wz.id!=0){
-  //    deletwzarr.push(wz.id);
-  //  }
-}
-
-const goback=()=>{
-   try {
-               uni.navigateBack();
-            } catch (E) { }
-            
-}
-const dosavedata = ()=>{
-   Toast.loading({
-  message: '加载中...',
-   duration: 0,
-  forbidClick: true,
-});
-  var data = whdata.value;
-  data["resourceDetailList"] = wzdata.aar;
-  api_putresource(data).then((res)=>{
-    Toast.clear();
-    setTimeout(() => {
-       Toast("保存成功");
-    }, 1000);
-   
-    // Notify({ type: 'success', message: '保存成功'});
-    getdata()
-
-  }).catch((ee)=>{Toast.clear();});
-}
+const editclick = () => {
+  isedit.value = false;
+};
+const deletewz = (index) => {
+  if (index >= wzdata.aar.length) {
+    return;
+  }
+  wzdata.aar.splice(index, 1);
+};
 
-const getdata = ()=>{
+const goback = () => {
+  try {
+    uni.navigateBack();
+  } catch (E) {}
+};
+const dosavedata = () => {
   Toast.loading({
-  message: '加载中...',
-   duration: 0,
-  forbidClick: true,
-});
-api_getresource({
-  resourceType:1
-}).then((res)=>{
-    Toast.clear();
-  if(res.rows.length>0){
-    isempt.value=false;
-    // whdata.value = res.rows.find(i=>i.id=="1481549762984415233")
-    whdata.value = (res.rows[0]) ;
-    api_getresourcedetail(whdata.value.id).then((res1)=>{
-      if(res1.data.resourceDetailList == null || res1.data.resourceDetailList.length==0){
-        // debugger
-         Toast('仓库还没有物资，请添加物资！');
-      }else{
-        wzdata.aar = res1.data.resourceDetailList;
-        // console.log(whdata)
-      }
+    message: '加载中...',
+    duration: 0,
+    forbidClick: true,
+  });
+  var data = whdata.value;
+  data['resourceDetailList'] = wzdata.aar;
+  api_putresource(data)
+    .then((res) => {
+      Toast.clear();
+      setTimeout(() => {
+        Toast('保存成功');
+      }, 1000);
 
+      // Notify({ type: 'success', message: '保存成功'});
+      getdata();
     })
+    .catch((ee) => {
+      Toast.clear();
+    });
+};
 
+const isbj = ref(true);
 
-  }else{
-    Toast('未获取到仓库信息，请联系管理员！');
-
+const route = useRoute();
+onMounted(()=>{
+  var taskid =  route.query.taskid;
+  if(taskid){
+    api_isbj(taskid).then((res)=>{
+     
+     
+        isbj.value = !res.data;
+        console.log(isbj.value)
+      
+    })
   }
 
+})
 
-    }).catch((eer)=>{  Toast.clear();})
-}
+const getdata = () => {
+  Toast.loading({
+    message: '加载中...',
+    duration: 0,
+    forbidClick: true,
+  });
+  api_getresource({
+    resourceType: 1,
+  })
+    .then((res) => {
+      Toast.clear();
+      if (res.rows.length > 0) {
+        isempt.value = false;
+        // whdata.value = res.rows.find(i=>i.id=="1481549762984415233")
+        whdata.value = res.rows[0];
+        api_getresourcedetail(whdata.value.id).then((res1) => {
+          if (
+            res1.data.resourceDetailList == null ||
+            res1.data.resourceDetailList.length == 0
+          ) {
+            // debugger
+            Toast('仓库还没有物资，请添加物资！');
+          } else {
+            wzdata.aar = res1.data.resourceDetailList;
+            // console.log(whdata)
+          }
+        });
+      } else {
+        Toast('未获取到仓库信息，请联系管理员！');
+      }
+    })
+    .catch((eer) => {
+      Toast.clear();
+    });
+};
 getdata();
 
-
 // onUpdated(()=>{
 //     //根据管理单位获取仓库信息
 //     api_getresource({}).then((res)=>{
@@ -213,11 +281,6 @@ getdata();
 //     })
 
 // });
-
-
-
-
-
 </script>
 
 <style lang="scss">
@@ -227,6 +290,16 @@ getdata();
   font-family: PingFangSC, PingFangSC-Regular;
   color: #333333;
 }
+.bjbtn {
+  font-size: 14px;
+  font-weight: 500;
+  color: #ffffff;
+  font-size: 13px;
+  font-weight: 500;
+  background: #bb0000;
+  padding: 3px 8px;
+  border-radius: 2px;
+}
 .content {
   .cell-header {
     font-family: PingFangSC, PingFangSC-Regular;