wenhongquan 3 ani în urmă
părinte
comite
0cbeefed6b

+ 3 - 2
src/views/WHPList/index.vue

@@ -43,8 +43,7 @@ const opendetail = (item)=>{
    router.push("/chemical/detail")
 }
 
-onMounted(()=>{
-  Toast.loading({
+Toast.loading({
     message: '加载中...',
     duration: 0,
     forbidClick: true,
@@ -54,6 +53,8 @@ onMounted(()=>{
     // console.log(res);
     reslist.value = res.rows;
   })
+onMounted(()=>{
+  
 
 })
 

+ 5 - 1
src/views/WHPSearch/index.vue

@@ -20,7 +20,7 @@
         <div class="delbtn" @click="delallhis"></div>
       </div>
       <div class="ccontent">
-        <div class="cname" v-for="item in searchhisname" @click="searchvalue =item ">{{ item }}</div>
+        <div class="cname" v-for="item in searchhisname" @click="hisclick(item)">{{ item }}</div>
       </div>
     </div>
 
@@ -123,6 +123,10 @@ watch(
   },
 );
 
+const hisclick =(item)=>{
+  searchvalue.value = item;
+  onSearch(item);
+}
 const goback = () => {
   try {
     uni.navigateBack();

+ 15 - 4
src/views/Warehouse/index.vue

@@ -20,19 +20,19 @@
               v-model="whdata.value.name"
               label="仓库命名"
               input-align="right"
-              :readonly="isedit"
+              :readonly="!isedit"
               placeholder="请输入仓库命名"
             />
             <van-field
               v-model="whdata.value.manageUnit"
               label="管理单位"
               input-align="right"
-              :readonly="isedit"
+              :readonly="!isedit"
               placeholder="请输入管理单位"
             />
             <van-field
               v-model="whdata.value.contactName"
-              :readonly="isedit"
+              :readonly="!isedit"
               label="联系人"
               input-align="right"
               placeholder="请输入联系人"
@@ -40,7 +40,7 @@
             <van-field
               v-model="whdata.value.contactPhone"
               label="联系方式"
-              :readonly="isedit"
+              :readonly="!isedit"
               input-align="right"
               placeholder="请输入联系方式"
             />
@@ -56,24 +56,28 @@
             <van-field
               v-model="item.name"
               label="名称"
+               :readonly="!isedit"
               input-align="right"
               placeholder="请输入名称"
             />
             <van-field
               v-model="item.model"
               label="型号"
+               :readonly="!isedit"
               input-align="right"
               placeholder="请输入型号"
             />
             <van-field
               v-model="item.size"
               label="规格"
+               :readonly="!isedit"
               input-align="right"
               placeholder="请输入规格"
             />
             <van-field
               v-model="item.num"
               label="仓储数量"
+               :readonly="!isedit"
               type="number"
               input-align="right"
               placeholder="请输入数量"
@@ -81,6 +85,7 @@
             <van-field
               v-model="item.availableNum"
               label="可用数量"
+               :readonly="!isedit"
               type="number"
               input-align="right"
               placeholder="请输入数量"
@@ -88,6 +93,7 @@
             <van-field
               v-model="item.unit"
               label="单位"
+               :readonly="!isedit"
               input-align="right"
               placeholder="请输入单位"
             />
@@ -369,4 +375,9 @@ const getdata = () => {
     }
   }
 }
+:root{
+  --van-disabled-opacity:1
+
+}
+
 </style>

+ 14 - 6
src/views/WarehouseEdit/index.vue

@@ -17,20 +17,20 @@
               v-model="whdata.value.name"
               label="仓库命名"
               input-align="right"
-              :readonly="isedit"
+              :readonly="!isedit"
               placeholder="请输入仓库命名"
             />
             <van-field
               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="请输入联系人"
@@ -39,7 +39,7 @@
               v-model="whdata.value.contactPhone"
               required
               label="联系方式"
-              :readonly="isedit"
+              :readonly="!isedit"
               input-align="right"
               placeholder="请输入联系方式"
             />
@@ -47,9 +47,11 @@
             <van-field
               v-model="whdata.value.address"
               label="地址"
-              :readonly="isedit"
+              :readonly="!isedit"
               input-align="right"
               placeholder="请输入地址"
+              type="search" 
+              @keydown="onsearch"
             >
               <template #button v-if="isedit">
                 <van-button
@@ -78,7 +80,7 @@
           <img :src="icon_map_location" />
         </div>
         <div v-if="isedit" class="marklocation" @click="getLocation">
-          <img src="../../assets/icons/incident/location.svg" />
+          <img src="../../assets/icons/incident/location1.png" />
         </div>
 
         <div v-if="isedit" style="position: absolute; right: 21px; top: 21px">
@@ -142,6 +144,12 @@ const whdata = reactive({
 const isedit = ref(false);
 const isempt = ref(true);
 
+const onsearch= (e)=>{
+  if(e.keyCode==13){
+    searchaddr()
+  }
+
+}
 
 onMounted(() => {
   whdata.value = JSON.parse(localStorage.getItem('cck'));

+ 12 - 2
src/views/WarehouseSearch/index.vue

@@ -17,7 +17,7 @@
        <div class="delbtn" @click="delallhis"></div>
       </div>
       <div class="ccontent">
-         <div class="cname" v-for="item in searchhisname" @click="searchvalue =item ">{{item}}</div>
+         <div class="cname" v-for="item in searchhisname" @click="hisclick(item)">{{item}}</div>
       </div>
     </div>
 
@@ -105,7 +105,10 @@ const onSearch = (val) => {
 
 };
 
-
+const hisclick =(item)=>{
+  searchvalue.value = item;
+  onSearch(item);
+}
 const gotockedit=(item)=>{
   localStorage.setItem("cck",JSON.stringify(item))
   localStorage.setItem("cedit",false)
@@ -119,8 +122,15 @@ const gotowzedit=(item)=>{
   router.push("/warehouse/detail")
 }
 const onCancel = () => {
+  goback();
 
 };
+const goback = () => {
+  try {
+    uni.navigateBack();
+  } catch (E) {}
+   window.history.back();
+};
 const searchhisname = ref([])
 
 const searchvalue = ref("");