Ver código fonte

Merge branch 'master' of http://git.yujin.shuziyunyao.com/yujin/forestry-wx

lisy 2 semanas atrás
pai
commit
6e21401f46
33 arquivos alterados com 650 adições e 465 exclusões
  1. 3 1
      src/components/ut-suspension/ut-suspension.vue
  2. 8 0
      src/pages.json
  3. 17 187
      src/pages/plant/processing/index.vue
  4. 0 114
      src/pages/plant/processing/models/output.vue
  5. 8 8
      src/plant/base/base-edit/index.vue
  6. 2 2
      src/plant/base/base-edit/models/form-plot.vue
  7. 5 5
      src/plant/base/gap-base-info-edit/index.vue
  8. 3 3
      src/plant/base/mark-base/index.vue
  9. 4 4
      src/plant/contact-unit/unit-edit/index.vue
  10. 255 2
      src/plant/packaging/create/index.vue
  11. 29 0
      src/plant/packaging/create/types.ts
  12. 141 2
      src/plant/packaging/list/index.vue
  13. 37 37
      src/plant/port/port-create/index.vue
  14. 9 9
      src/plant/port/port-harvest-create/index.vue
  15. 6 6
      src/plant/port/supervise/supervise-breeding-create/index.vue
  16. 5 5
      src/plant/port/supervise/supervise-plant-create/index.vue
  17. 5 5
      src/plant/port/supervise/supervise-raising-create/index.vue
  18. 8 8
      src/plant/processing/processing-create/index.vue
  19. 3 3
      src/plant/processing/processing-detail-list/models/outputInfo.vue
  20. 1 1
      src/plant/storage/agro-product/add/index.vue
  21. 5 5
      src/plant/storage/agro-product/info-edit/index.vue
  22. 6 6
      src/plant/storage/agro-product/info-update/index.vue
  23. 1 1
      src/plant/storage/fresh-goods/add/index.vue
  24. 6 6
      src/plant/storage/fresh-goods/info-edit/index.vue
  25. 9 9
      src/plant/storage/fresh-goods/info-update/index.vue
  26. 1 1
      src/plant/storage/loss-register/index.vue
  27. 6 3
      src/plant/storage/medicine/list/index.vue
  28. 1 1
      src/plant/storage/seed-source/add/index.vue
  29. 11 11
      src/plant/storage/seed-source/info-edit/index.vue
  30. 16 16
      src/plant/storage/seed-source/info-update/index.vue
  31. 2 2
      src/plant/storage/storage-room/edit/index.vue
  32. 2 2
      src/tools/species-info/index.vue
  33. 35 0
      src/tools/view-html/index.vue

+ 3 - 1
src/components/ut-suspension/ut-suspension.vue

@@ -14,7 +14,9 @@
                 height: height,
             }"
             @click="handleClick">
-            <slot />
+            <slot>
+                <image src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/btn_add_logo.png" mode="widthFix" class="w-120 h-120"></image>
+            </slot>
         </movable-view>
     </movable-area>
 </template>

+ 8 - 0
src/pages.json

@@ -581,6 +581,14 @@
                         "navigationBarTitleText": "选择规格等级",
                         "navigationStyle": "custom"
                     }
+                },
+                // 传入html地址                
+                {
+                    "path": "view-html/index",
+                    "style": {
+                        "navigationBarTitleText": "view-html页面",
+                        "navigationStyle": "custom"
+                    }
                 }
             ]
         },

+ 17 - 187
src/pages/plant/processing/index.vue

@@ -1,196 +1,26 @@
 <template>
-    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query" hide-no-more-inside>
+    <z-paging ref="paging" bgColor="#F7F7F7">
         <template #top>
-            <up-navbar title="加工及包装赋码任务" :fixed="false"> </up-navbar>
+            <up-navbar title="加工及包装赋码任务" :fixed="false" :isLeftBack="false" :breadcrumb="false"> </up-navbar>
         </template>
-        <template>
-            <view class="pd3-24-24-0">
-                <view class="">
-                    <ut-tabs mode="subsection" v-model="form.restFlag" :tabs="tabs" @change="onRefresh"></ut-tabs>
+        <view class="base-content pd-20">
+            <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/processing/processing-index/index' })">
+                <image class="w-72 h-72" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/storage/nav_kfgl_icon.png" mode="widthFix" />
+                <view class="flex1 pd2-0-20">
+                    <view class="f-s-30 c-#333 f-w-500">加工</view>
+                    <view class="f-s-22 c-#999">对原材料进行加工处理</view>
                 </view>
+                <up-icon name="arrow-right"></up-icon>
             </view>
-            <view class="d-flex a-c pd-24 pb-0 bg-#f7f7f7">
-                <view class="min-w-170 flex1">
-                    <ut-action-sheet v-model="form.taskType" :tabs="[{ label: '全部', value: '' }, ...pt_process_type]" @change="onRefresh" title="选择原料类型">
-                        <view class="d-flex search-select-item a-c">
-                            <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 w-s-no">{{ selectDictLabel(pt_process_type, form.taskType) || '全部' }}</view>
-                            <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
-                        </view>
-                    </ut-action-sheet>
-                </view>
-                <view class="h-86 pl-20 w-100%">
-                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" @change="changeSeach" margin="0" :border="false" placeholder="搜药材名、批号" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
-                </view>
-            </view>
-            <view class="pd-24">
-                <template v-for="(item, index) in list" :key="index">
-                    <view class="bg-#fff b-radius pd-24 p-rtv mb-16">
-                        <view v-if="+item?.processType == 1 && +item?.processMedType == 1" class="bg-#91C747 c-#fff f-w-5 pd-10 pt-4 pb-4 f-s-20" style="border-radius: 16rpx 0 16rpx 0; width: max-content; position: absolute; top: 0rpx; left: 0rpx">种子初加工</view>
-                        <view v-if="+item?.processType == 1 && +item?.processMedType == 2" class="bg-#C7A262 c-#fff f-w-5 pd-10 pt-4 pb-4 f-s-20" style="border-radius: 16rpx 0 16rpx 0; width: max-content; position: absolute; top: 0rpx; left: 0rpx">药材初加工</view>
-                        <view v-if="+item?.processType == 2" class="bg-#37A954 c-#fff f-w-5 pd-10 pt-4 pb-4 f-s-20" style="border-radius: 16rpx 0 16rpx 0; width: max-content; position: absolute; top: 0rpx; left: 0rpx">趁鲜切制</view>
-                        <view v-if="item?.processingDate || item?.processingDateEnd" class="d-flex a-c j-ed">
-                            <view class="c-#999 f-s-24">{{ item?.processingDate }} 至 {{ item?.processingDateEnd }}</view>
-                        </view>
-                        <view class="mb-10 d-flex a-c" @click="gotodetaillist(item)">
-                            <view class="">
-                                <span v-if="item?.variety" class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.variety }}</span>
-                                <span v-else class="f-s-34 c-#333 f-w-500 mr-10">{{ item?.medicineName }}(鲜制)</span>
-                                <span class="f-s-24 c-#666" v-if="+item?.processMedType == 1">{{ selectDictLabel(pt_stock_type, item?.processMedType) }}</span>
-                            </view>
-                            <view class="flex1"></view>
-                            <up-icon name="arrow-right" size="26rpx"></up-icon>
-                        </view>
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">加工批号:</span>
-                            <span class="c-#333 f-w-500">{{ item?.processCode }}</span>
-                        </view>
-                        <view v-if="+item?.processType == 1" class="pd2-4-0 f-s-28">
-                            <span class="c-#666">执行标准:</span>
-                            <span class="c-#333 f-w-500">{{ selectDictLabel(pt_standard_type, item?.standardType) }}</span>
-                            <span class="c-#666" v-if="item?.standardDetailName">({{ item?.standardDetailName }})</span>
-                        </view>
-                        <view v-else class="pd2-4-0 f-s-28">
-                            <span class="c-#666">执行标准:</span>
-                            <span class="c-#666" v-if="item?.standardDetailName">{{ item?.standardDetailName }}</span>
-                        </view>
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">加工工艺:</span>
-                            <template v-for="(items, indexs) in item?.ptech?.split(',')" v-if="item?.ptech" :key="indexs">
-                                <span v-if="indexs !== 0" class="c-#999 f-s-32 ml-10 mr-10">→ </span>
-                                <span class="f-s-32">{{ items }}</span>
-                            </template>
-                            <template v-else>
-                                <span class="c-#999 f-s-32">-</span>
-                            </template>
-                        </view>
-                        <view class="pd2-4-0 f-s-28">
-                            <span class="c-#666">加工负责人:</span>
-                            <span class="c-#333 f-w-500">{{ item?.contactName }}</span>
-                        </view>
-                        <Output :data="item" />
-                    </view>
-                </template>
-            </view>
-        </template>
-        <view class="h-210" v-if="list?.length"></view>
-        <view v-if="list?.length" :style="{ height: `${safeAreaBottom}px` }"></view>
-        <template #empty>
-            <view class="d-flex flex-cln a-c">
-                <ut-empty class="mg-at" color="#ccc" size="28rpx" image="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/noEmptyBase.png">暂无加工任务</ut-empty>
-                <text class="c-#ccc f-s-28">点击下方按钮去添加吧~</text>
-            </view>
-        </template>
-        <template #bottom>
-            <ut-tabar activeTab="processing"></ut-tabar>
-        </template>
-    </z-paging>
-    <ut-suspension v-if="sus?.left" :imageWidth="60" :imageHeight="60" :x="sus?.left" :y="sus?.bottom" :inertia="false" :snap-threshold="40">
-        <image src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/common/btn_add_logo.png" mode="widthFix" class="w-120 h-120" @click="showDeleteDialog = true"></image>
-    </ut-suspension>
-    <ut-confirm-dialog v-model:show="showDeleteDialog" width="80vw" title="请选择要创建的任务类型" :confirmText="'确认选择'" :cancelText="'取消'" @confirm="handlechoseConfirm" @cancel="handleDeleteCancel">
-        <view class="" v-for="item in pt_process_type" :key="item?.value">
-            <view style="border: 1rpx solid" :style="{ backgroundColor: item?.value == basetype ? '#EBF6EE' : '#f7f7f7', borderColor: item?.value == basetype ? '#37A954' : 'transparent' }" class="pr-30 d-flex a-c mb-20 radius-100" @click="handlechose(item.value)">
-                <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '1'">
-                    <up-avatar size="90rpx" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/port/TaskType_plant.png"></up-avatar>
-                </view>
-                <view class="radius-50% mg-8 bg-#F0F0F0" v-if="item?.value == '2'">
-                    <up-avatar size="90rpx" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/port/TaskType_breeding.png"></up-avatar>
-                </view>
-                <view class="c-#333 f-s-34">
-                    {{ item?.label }}
-                </view>
-                <view class="flex1"></view>
-                <view class="d-flex">
-                    <img v-if="basetype === item.value" class="w-30 h-30" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/chooseSuccessfully.png" mode="widthFix" alt="" />
+            <view class="bg-#fff d-flex a-c j-c radius-16 pd2-30-24 mb-20" @click="$u.route({ url: '/plant/packaging/list/index' })">
+                <image class="w-72 h-72" src="https://ta.zycpzs.cn/oss-file/smart-trace/szyy/images-plt/plant/storage/nav_zyk_icon.png" mode="widthFix" />
+                <view class="flex1 pd2-0-20">
+                    <view class="f-s-30 c-#333 f-w-500">包装赋码</view>
+                    <view class="f-s-22 c-#999">对加工后的产品进行包装</view>
                 </view>
+                <up-icon name="arrow-right"></up-icon>
             </view>
         </view>
-    </ut-confirm-dialog>
+    </z-paging>
 </template>
-<script setup lang="ts">
-import { useClientRequest } from '@/utils/request';
-import Output from './models/output.vue';
-const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { pt_process_type, pt_stock_type, pt_standard_type } = toRefs<any>(proxy?.useDict('pt_process_type', 'pt_stock_type', 'pt_standard_type'));
-const sus = ref({
-    left: 0,
-    bottom: 0,
-});
-const systemInfo = uni.getSystemInfoSync();
-const windowInfo = uni.getWindowInfo();
-const safeAreaBottom = windowInfo.safeAreaInsets.bottom;
-sus.value.left = systemInfo.windowWidth - 10;
-sus.value.bottom = systemInfo.windowHeight - 200;
-const showDeleteDialog = ref(false);
-const basetype = ref();
-const handlechose = (item: string) => {
-    basetype.value = item;
-};
-// 处理取消
-const handleDeleteCancel = () => {
-    showDeleteDialog.value = false;
-    basetype.value = '';
-};
-const handlechoseConfirm = () => {
-    if (!basetype.value) {
-        uni.showToast({
-            title: '请选择要创建的任务类型',
-            icon: 'none',
-            duration: 2000,
-        });
-        return;
-    }
-    uni.$u.route({ type: 'navigateTo', url: '/plant/processing/processing-create/index', params: { taskType: basetype.value } });
-};
-const paging = ref();
-const list = ref<any[]>([]);
-const tabs = [
-    {
-        label: '加工',
-        value: '0',
-    },
-    {
-        label: '包装赋码',
-        value: '1',
-    },
-];
-const form = ref({
-    storageType: '4',
-});
-const query = async (pageNum: number, pageSize: number) => {
-    const params = {
-        pageNum,
-        pageSize,
-        ...form.value,
-    };
-    const res = await useClientRequest.get('/plt-api/app/processe/pageList', params);
-    if (res) {
-        const { rows } = res;
-        paging.value.complete(rows);
-    }
-};
-const gotodetaillist = (item: any) => {
-    uni.$u.route({
-        type: 'navigateTo',
-        url: '/plant/processing/processing-detail-list/index',
-        params: { id: item?.id },
-    });
-};
-const onRefresh = () => {
-    paging.value?.reload();
-};
-onMounted(() => {
-    uni.$on('updateprocesstasklist', function () {
-        paging.value?.reload();
-    });
-});
-</script>
-<style scoped lang="scss">
-.search-select-item {
-    height: 86rpx;
-    background-color: #fff;
-    border-radius: 10rpx;
-    box-sizing: border-box;
-    padding: 12rpx;
-}
-</style>
+<script setup lang="ts"></script>

+ 0 - 114
src/pages/plant/processing/models/output.vue

@@ -1,114 +0,0 @@
-<template>
-    <view class="radius-10 bg-#f7f7f7 d-flex mb-10 mt-10">
-        <view class="bg-#EDF7F0 w-50 h-110 d-flex flex-cln a-c j-c c-primary f-w-5 f-s-24">
-            <view class="">原</view>
-            <view class="">料</view>
-        </view>
-        <view class="bg-#F5FBF7 flex1 d-flex a-c" v-if="Object.keys(inputList || {}).length === 0">
-            <view class="d-flex flex1 f-s-26">
-                <view class="c-#999 ml-16"> 暂无关联原料信息 </view>
-                <view class="flex1"></view>
-                <view class="c-primary d-flex a-c" @click="goAssociate">
-                    <view>去关联</view>
-                    <up-icon name="arrow-right" size="26rpx"></up-icon>
-                </view>
-            </view>
-        </view>
-        <view class="bg-#F6FAFE flex1 f-s-22 d-flex a-c pd-16" v-else>
-            <ut-row gap="10rpx" class="w-100%">
-                <ut-col class="d-flex flex-cln j-c" :span="15">
-                    <view class="d-flex a-c">
-                        <span class="c-#666 f-s-26">{{ inputList?.materialName }}</span>
-                        <span class="c-#999 f-s-22 ml-10">{{ inputList?.storageInfo?.partName }}</span>
-                    </view>
-                    <view class="d-flex">
-                        <span class="c-#999 f-s-22">{{ inputList?.storageInfo?.batchCode }}</span>
-                    </view>
-                </ut-col>
-                <ut-col class="d-flex a-c c-#666" :span="10">{{ inputList?.quantity }}{{ inputList?.unit }}</ut-col>
-                <ut-col class="d-flex a-c j-ed" :span="5" @click.stop="withdraw">
-                    <span class="c-#666">撤回</span>
-                    <up-icon name="arrow-right" size="26rpx"></up-icon>
-                </ut-col>
-            </ut-row>
-        </view>
-    </view>
-    <view class="radius-10 bg-#f7f7f7 d-flex">
-        <view class="bg-#EBF4FD w-50 d-flex flex-cln a-c j-c c-#2289E0 f-w-5 f-s-24">
-            <view class="">产</view>
-            <view class="">出</view>
-        </view>
-        <view class="bg-#F6FAFE flex1 d-flex a-c" v-if="data?.length === 0">
-            <view class="d-flex flex1 f-s-26">
-                <view class="c-#999 ml-16"> 暂无产出信息 </view>
-                <view class="flex1"></view>
-                <view class="c-#2289E0 d-flex a-c">
-                    <view>添加产出</view>
-                    <up-icon name="arrow-right" size="26rpx"></up-icon>
-                </view>
-            </view>
-        </view>
-        <view class="bg-#F6FAFE flex1 f-s-22 pd-16" v-else>
-            <ut-row gap="10rpx">
-                <ut-col class="d-flex a-c c-#666" :span="2">01</ut-col>
-                <ut-col class="d-flex flex-cln j-c" :span="8">
-                    <span class="c-#666">统货2</span>
-                    <span class="c-#999">1mm极薄片</span>
-                </ut-col>
-                <ut-col class="d-flex a-c c-#666" :span="8">19999kg</ut-col>
-                <ut-col class="d-flex a-c" :span="3">
-                    <span class="c-#F74C30">未检</span>
-                    <span class="c-primary">已检</span>
-                </ut-col>
-                <ut-col class="d-flex a-c j-ed" :span="9">
-                    <span class="c-#666">已入药材库</span>
-                    <span class="c-#666">未入库</span>
-                    <up-icon name="arrow-right" size="26rpx"></up-icon>
-                </ut-col>
-            </ut-row>
-            <view class="d-flex a-c j-c pd-16 radius-10" style="border: 1rpx dashed #2289e0">
-                <up-icon name="plus" size="26rpx" color="#2289E0"></up-icon>
-                <span class="c-#2289E0 f-s-26">添加产出物</span>
-            </view>
-        </view>
-    </view>
-</template>
-<script setup lang="ts">
-import { useClientRequest } from '@/utils/request';
-const props = defineProps<{
-    data: any;
-}>();
-watch(
-    () => props.data,
-    (val) => {
-        inputList.value = val?.inputList[0] || {};
-    },
-);
-const inputList = ref<any>(props?.data?.inputList[0] || {});
-const goAssociate = () => {
-    uni.$u.route({
-        type: 'navigateTo',
-        url: '/tools/species-info-process/index',
-        params: { id: props?.data?.id, processMedType: props?.data?.processMedType },
-    });
-};
-uni.$on(`updatesupervise-${props?.data?.id}`, function (data) {
-    inputList.value = data;
-});
-const withdraw = async () => {
-    // 删除
-    const res = await uni.showModal({
-        title: '撤回提示',
-        content: '撤回后不可恢复,请谨慎操作!',
-        confirmColor: '#F74C30',
-    });
-    console.log(res);
-    if (res.confirm) {
-        const delRes = await useClientRequest.get(`/plt-api/app/processInputMaterial/callbackInput/${inputList?.value?.id}`);
-        if (delRes && delRes.code === 200) {
-            uni.showToast({ title: '删除成功', icon: 'none' });
-            inputList.value = {};
-        }
-    }
-};
-</script>

+ 8 - 8
src/plant/base/base-edit/index.vue

@@ -42,7 +42,7 @@
                     <up-form-item borderBottom label="建设时间" prop="baseInfo.buildDate">
                         <up-input v-model="form.baseInfo.buildDate" readonly placeholder="请选择基地建设年份" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>
@@ -53,7 +53,7 @@
                         <view v-if="form.baseInfo.orgType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_org_type, form.baseInfo.orgType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择基地组织方式</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -64,7 +64,7 @@
                     <view v-if="form.baseInfo.contactId" class="f-s-30 c-333 f-w-5 flex1">{{ form.baseInfo.contactName }}</view>
                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择基地负责人</view>
                     <template #right>
-                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                     </template>
                 </up-form-item>
                 <!-- 填写基地联系电话 -->
@@ -79,7 +79,7 @@
                         <view v-if="form?.baseInfo?.gapInfo?.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form?.baseInfo?.gapInfo?.adcodeName }} </view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择基地所在省/市/县/镇(乡)</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                     <up-form-item borderBottom prop="baseInfo.gapInfo.address">
@@ -263,7 +263,7 @@
                             <view v-if="form.environmentInfo.soilType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_soil_type, form.environmentInfo.soilType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择土壤类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -273,7 +273,7 @@
                             <view v-if="form.environmentInfo.soilTexture" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_soil_texture, form.environmentInfo.soilTexture) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择土壤质地</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -288,7 +288,7 @@
                             <view v-if="form.environmentInfo.waterType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_water_type, form.environmentInfo.waterType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择水源类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -370,7 +370,7 @@
                             <view v-if="form.environmentInfo.waterType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_water_type, form.environmentInfo.waterType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择水源类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 2 - 2
src/plant/base/base-edit/models/form-plot.vue

@@ -27,7 +27,7 @@
                                             <!-- 可点击选择单位 -->
                                             <view class="d-flex pd-10" style=""> 
                                                 <span>{{ form.capacityUnit || '瓶' }}</span>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </view>
                                         </ut-action-sheet>
                                     </view>
@@ -50,7 +50,7 @@
                             <view v-if="form.contact" class="f-s-30 c-333 f-w-5 flex1">{{ form.contactName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择负责人</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </up-form>

+ 5 - 5
src/plant/base/gap-base-info-edit/index.vue

@@ -17,7 +17,7 @@
                                 form.gapBaseType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择基地类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -32,7 +32,7 @@
                         <view v-if="form.medicineCode" class="f-s-30 c-333 f-w-5 flex1">{{ form.medicineName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择获评品种</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
 
@@ -59,7 +59,7 @@
                         <view v-if="form?.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form?.adcodeName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择基地所在省/市/县/镇(乡)</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                     <up-form-item borderBottom prop="address">
@@ -92,10 +92,10 @@
                     <view class="h-1" id="ratedDatepppp"></view>
                     <ut-datetime-picker v-model="form.ratedDate" mode="date" :minDate="new Date(1990, 0, 1)" dateFields="day">
                         <up-form-item borderBottom label="获评GAP基地时间" required prop="ratedDate">
-                            <up-input v-model="form.ratedDate" placeholder="请选择获评GAP基地时间" border="none"
+                            <up-input v-model="form.ratedDate" readonly placeholder="请选择获评GAP基地时间" border="none"
                                 clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-datetime-picker>

+ 3 - 3
src/plant/base/mark-base/index.vue

@@ -19,16 +19,16 @@
                                 <view v-if="formRes.medicineCode" class="f-s-30 c-333 f-w-5 flex1">{{ formRes.medicineName }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择获评品种</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                             <!-- 校验定位:建设时间 -->
                             <view class="h-1" id="ratedDatepppp"></view>
                             <ut-datetime-picker v-model="formRes.ratedDate" mode="date" dateFields="day">
                                 <up-form-item borderBottom label="获评基地时间" required prop="ratedDate">
-                                    <up-input v-model="formRes.ratedDate" placeholder="请选择获评基地时间" border="none" clearable></up-input>
+                                    <up-input v-model="formRes.ratedDate" readonly placeholder="请选择获评基地时间" border="none" clearable></up-input>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-datetime-picker>

+ 4 - 4
src/plant/contact-unit/unit-edit/index.vue

@@ -12,7 +12,7 @@
                         <view v-if="form.cpyType?.length" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_cpy_type, form.cpyType, ',') }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择往来单位类型</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -23,7 +23,7 @@
                         <view v-if="form.cusType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_cus_type, form.cusType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择往来单位性质</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -57,7 +57,7 @@
                         <view v-if="form.subdivisionType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_subdivision_type, form.subdivisionType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择细分类型</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -78,7 +78,7 @@
                     <view v-if="form.adcdCode" class="f-s-30 c-333 f-w-5 flex1">{{ form.adcdCodeName }}</view>
                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择往来单位所在地区</view>
                     <template #right>
-                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                     </template>
                 </up-form-item>
 

+ 255 - 2
src/plant/packaging/create/index.vue

@@ -1,3 +1,256 @@
 <template>
-    <view>xx</view>
-</template>
+    <z-paging ref="paging" bgColor="#fff" safe-area-inset-bottom paging-class="paging-btm-shadow" scroll-with-animation>
+        <template #top>
+            <ut-navbar :title="did ? '编辑包装任务' : '创建包装任务'" :fixed="false" border></ut-navbar>
+        </template>
+        <up-form class="p-rtv" labelPosition="top" :model="form" :rules="rules" labelWidth="auto" ref="upFormRef">
+            <view class="pd-24 bg-#fff mb-10">
+                <view class="h-1" id="inputStorageIdpppp"></view>
+                <up-form-item borderBottom label="选择包装对象" prop="inputStorageId" required>
+                     
+                </up-form-item>
+                <view class="h-1" id="storageUseAmountpppp"></view>
+                <up-form-item borderBottom label="本次包装用量" prop="storageUseAmount" required>
+                    <up-input v-model="form.storageUseAmount" placeholder="请输入本次包装用量" border="none" clearable></up-input>
+                    <template #right>
+                        <span class="f-s-30 f-w-5 c-#333">{{ form?.stroeUnit || 'kg' }}</span>
+                    </template>
+                </up-form-item>
+                <view class="h-1" id="capacitypppp"></view>
+                <view class="h-1" id="unitpppp"></view>
+                <up-form-item label="包装规格" prop="spec" required class="form-item-bottom-padding-0">
+                    <div class="flex1 d-flex">
+                        <div class="flex1 ov-hd">
+                            <up-form-item prop="capacity" border-bottom class="form-item-top-padding-0">
+                                <up-input v-model="form.capacity" placeholder="请输入包装规格" border="none" clearable></up-input>
+                            </up-form-item>
+                        </div>
+                        <div class="pd-5"></div>
+                        <div class="w-200">
+                            <up-form-item prop="stroeUnit" border-bottom class="form-item-top-padding-0">
+                                <up-input v-model="form.stroeUnit" inputAlign="center" readonly placeholder="单位" border="none" clearable></up-input>
+                            </up-form-item>
+                        </div>
+                        <div class="pd2-0-10 c-#ccc d-flex a-c j-c">/</div>
+                        <div class="w-200">
+                            <ut-action-sheet v-model="form.unit" :tabs="pt_pack_spec_unit" mode="custom" title="选择单位">
+                                <up-form-item prop="unit" border-bottom class="form-item-top-padding-0">
+                                    <up-input v-model="form.unit" inputAlign="center" readonly placeholder="单位" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-action-sheet>
+                        </div>
+                    </div>
+                </up-form-item>
+                <view class="h-1" id="packagingDateStartpppp"></view>
+                <view class="h-1" id="packagingDateEndpppp"></view>
+                <up-form-item prop="packagingDateStart" required label="包装日期" class="form-item-bottom-padding-0">
+                    <view class="flex1 d-flex">
+                        <view class="flex1">
+                            <ut-datetime-picker v-model="form.packagingDateStart" :maxDate="form.packagingDateEnd || new Date()" mode="date">
+                                <up-form-item borderBottom prop="packagingDateStart" class="form-item-top-padding-0">
+                                    <up-input v-model="form.packagingDateStart" readonly placeholder="包装开始日期" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-datetime-picker>
+                        </view>
+                        <view class="pd2-0-20"></view>
+                        <view class="flex1">
+                            <ut-datetime-picker v-model="form.packagingDateEnd" :minDate="form.packagingDateStart" :maxDate="new Date()" mode="date">
+                                <up-form-item borderBottom prop="packagingDateEnd" class="form-item-top-padding-0">
+                                    <up-input v-model="form.packagingDateEnd" readonly placeholder="包装结束日期" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-datetime-picker>
+                        </view>
+                    </view>
+                </up-form-item>
+                <!-- 包装批号 -->
+                <view class="h-1" id="packSnpppp"></view>
+                <up-form-item borderBottom label="包装批号" prop="packSn" required>
+                    <up-input v-model="form.packSn" placeholder="请输入包装批号" border="none" clearable></up-input>
+                    <template #right>
+                        <up-button @click="generateBatchCode" type="primary" :customStyle="formItemBtnStyle">随机生成</up-button>
+                    </template>
+                </up-form-item>
+                <view class="h-1" id="batchSnpppp"></view>
+                <up-form-item borderBottom label="成品批号" prop="batchSn" required>
+                    <up-input v-model="form.batchSn" placeholder="请输入成品批号" border="none" clearable></up-input>
+                </up-form-item>
+                <!-- 保质期 12月,数字加单位单位两个字段, expireDate,expireDateUnit -->
+                <view class="h-1" id="expireDatepppp"></view>
+                <view class="h-1" id="expireDateUnitpppp"></view>
+                <up-form-item label="保质期" prop="expireDate" required class="form-item-bottom-padding-0">
+                    <div class="flex1 d-flex a-c">
+                        <div class="flex1 ov-hd">
+                            <up-form-item prop="expireDate" border-bottom class="form-item-top-padding-0">
+                                <up-input v-model="form.expireDate" placeholder="请输入保质期" border="none" clearable></up-input>
+                            </up-form-item>
+                        </div>
+                        <div class="pd-5"></div>
+                        <div class="w-200">
+                            <ut-action-sheet v-model="form.expireDateUnit" :tabs="pt_expire_date_unit" mode="custom" title="选择单位">
+                                <up-form-item prop="expireDateUnit" border-bottom class="form-item-top-padding-0">
+                                    <up-input v-model="form.expireDateUnit" inputAlign="center" readonly placeholder="单位" border="none" clearable></up-input>
+                                    <template #right>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
+                                    </template>
+                                </up-form-item>
+                            </ut-action-sheet>
+                        </div>
+                    </div>
+                </up-form-item>
+                <!-- 请选择赋码方式 -->
+                <view class="h-1" id="packCodeTypepppp"></view>
+                <ut-action-sheet v-model="form.packCodeType" :tabs="pt_pack_code_type" mode="custom" title="请选择赋码方式">
+                    <up-form-item borderBottom label="赋码方式" required prop="packCodeType">
+                        <view v-if="form.packCodeType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_pack_code_type, form.packCodeType) }}</view>
+                        <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择赋码方式</view>
+                        <template #right>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
+                        </template>
+                    </up-form-item>
+                </ut-action-sheet>
+                <view class="d-flex a-c pd2-10-0" @click="$u.route({ url: '/tools/view-html/index', params: { url: 'https://ta.zycpzs.cn/oss-file/smart-trace/szyy/template/pack_code_type.html', title: '赋码方式区别' } })">
+                    <up-icon size="28rpx" name="question-circle" color="#37A954"></up-icon>
+                    <span class="c-primary f-s-24">两种赋码方式的区别?怎么选择?</span>
+                </view>
+            </view>
+        </up-form>
+        <template #bottom>
+            <view class="pd-20">
+                <up-button type="primary" @click="submit">
+                    <text>{{ did ? '保存' : '提交' }}</text>
+                </up-button>
+            </view>
+        </template>
+    </z-paging>
+</template>
+<script setup lang="ts">
+import { useClientRequest } from '@/utils/request';
+import { formItemBtnStyle } from '@/assets/styles/uview-plus';
+import type { PackTaskForm } from './types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { pt_pack_code_type, pt_pack_spec_unit, pt_expire_date_unit } = toRefs<any>(proxy?.useDict('pt_pack_code_type', 'pt_pack_spec_unit', 'pt_expire_date_unit'));
+const upFormRef = ref();
+const paging = ref();
+const did = ref<string>('');
+
+const form = ref<PackTaskForm>({
+    storageUseAmount: '',
+    stroeUnit: 'kg',
+    capacity: '',
+    unit: '',
+    packagingDateStart: '',
+    packagingDateEnd: '',
+    packSn: '',
+    batchSn: '',
+    expireDate: '',
+    expireDateUnit: '',
+    packCodeType: '',
+});
+
+const rules = reactive<Record<string, any>>({
+    storageUseAmount: [
+        { required: true, message: '请输入本次包装用量' },
+        {
+            asyncValidator: (rule: any, value: any) => {
+                if (value === undefined || value === null || value === '') return Promise.resolve();
+                const num = Number(value);
+                if (Number.isNaN(num)) return Promise.reject('本次包装用量请输入数字');
+                if (num <= 0) return Promise.reject('本次包装用量需大于0');
+                return Promise.resolve();
+            },
+        },
+    ],
+    capacity: [
+        { required: true, message: '请输入包装规格' },
+        {
+            asyncValidator: (rule: any, value: any) => {
+                if (value === undefined || value === null || value === '') return Promise.resolve();
+                const num = Number(value);
+                if (Number.isNaN(num)) return Promise.reject('包装规格请输入数字');
+                if (num <= 0) return Promise.reject('包装规格需大于0');
+                return Promise.resolve();
+            },
+        },
+    ],
+    stroeUnit: [{ required: true, message: '请选择包装单位' }],
+    unit: [{ required: true, message: '请选择单位' }],
+    packagingDateStart: [{ required: true, message: '请选择开始日期' }],
+    packagingDateEnd: [{ required: true, message: '请选择结束日期' }],
+    packSn: [{ required: true, message: '请输入包装批号' }],
+    batchSn: [{ required: true, message: '请输入成品批号' }],
+    expireDate: [{ required: true, message: '请输入保质期' }],
+    expireDateUnit: [{ required: true, message: '请选择保质期单位' }],
+    packCodeType: [{ required: true, message: '请选择赋码方式' }],
+});
+
+const loadDetail = async (id: string) => {
+    if (!id) return;
+    const res = await useClientRequest.get(`/plt-api/app/packTask/getInfo/${id}`);
+    if (res && res.code === 200) {
+        const data = res.data || {};
+        console.log(data);
+    }
+};
+
+const submit = async () => {
+    try {
+        await upFormRef.value?.validate();
+    } catch (error: any) {
+        const firstErrorField = error && error[0].prop + 'pppp';
+        paging.value?.scrollIntoViewById(firstErrorField, 30, true);
+        return;
+    }
+
+    try {
+        await uni.showLoading({ title: did.value ? '保存中...' : '提交中...', mask: true });
+        const url = did.value ? '/plt-api/app/packTask/edit' : '/plt-api/app/packTask/save';
+        const payload: any = { ...(form.value as any) };
+        if (did.value) payload.id = did.value;
+        const res = await useClientRequest.post(url, payload);
+        uni.hideLoading();
+        if (res && res.code === 200) {
+            uni.showToast({ title: did.value ? '保存成功' : '新增成功', icon: 'success' });
+            uni.$emit('refreshContactUnitDetail');
+            uni.$emit('refreshContactUnitList');
+            setTimeout(() => uni.navigateBack(), 300);
+        }
+    } catch (e) {
+        uni.hideLoading();
+        console.error('保存往来单位失败:', e);
+    }
+};
+// 点击随机生成服务端生成唯一的批号
+const generateBatchCode = async () => {
+    uni.showLoading({
+        title: '生成中...',
+    });
+    const res = await useClientRequest.post('/plt-api/app/plantationTask/getBatchCode', {
+        plType: 'Z',
+        linkType: 'I',
+    });
+    if (res && res.code === 200) {
+        uni.hideLoading();
+        form.value.packSn = res.data;
+        uni.showToast({
+            title: '批号生成成功',
+            icon: 'success',
+        });
+    }
+};
+const confirmArea = (area: any) => {
+    form.value.adcdCodeName = area.fullName;
+};
+
+onLoad((options: any) => {});
+</script>
+<style lang="scss" scoped></style>

+ 29 - 0
src/plant/packaging/create/types.ts

@@ -0,0 +1,29 @@
+export interface PackTaskForm {
+  /** 主键(编辑时使用) */
+  id?: string;
+  /** 本次包装用量 */
+  storageUseAmount?: number | string;
+  /** 包装规格:每包重量(例如 5、10) */
+  capacity?: number | string;
+  /** 包装规格单位(例如 kg、g) */
+  stroeUnit?: string;
+  /** 包装规格单位(选择) */
+  unit?: string;
+  /** 包装开始日期 */
+  packagingDateStart?: string | Date;
+  /** 包装结束日期 */
+  packagingDateEnd?: string | Date;
+  /** 包装批号 */
+  packSn?: string;
+  /** 成品批号 */
+  batchSn?: string;
+  /** 保质期数值 */
+  expireDate?: number | string;
+  /** 保质期单位 */
+  expireDateUnit?: string;
+  /** 赋码方式 */
+  packCodeType?: string;
+  /** 区域名称(如果有) */
+  adcdCodeName?: string;
+  [key: string]: any;
+}

+ 141 - 2
src/plant/packaging/list/index.vue

@@ -1,3 +1,142 @@
 <template>
-    <view>xx</view>
-</template>
+    <z-paging ref="paging" v-model="list" bgColor="#f7f7f7" @query="query">
+        <template #top>
+            <ut-navbar title="包装赋码任务" :fixed="false" :breadcrumb="false"></ut-navbar>
+        </template>
+
+        <view class="pd3-24-24-0">
+            <view class="d-flex a-c">
+                <view class="min-w-230 flex1">
+                    <ut-action-sheet v-model="form.processType" :tabs="[{ label: '全部', value: '', elTagClass: '15' }, ...pt_pack_code_type]" mode="custom" @change="onRefresh" title="选择入库类型">
+                        <view class="d-flex search-select-item a-c">
+                            <view class="flex1 ov-hd f-s-28 c-333 text-center f-w-5 up-line-1">{{ selectDictLabel(pt_pack_code_type, form.processType) || '全部' }} </view>
+                            <up-icon size="24rpx" color="#333" name="arrow-down-fill" class="mr-5"></up-icon>
+                        </view>
+                    </ut-action-sheet>
+                </view>
+                <view class="h-86 pl-20 w-100%">
+                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜品种名称、批号" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                </view>
+            </view>
+            <view></view>
+        </view>
+        <view class="pd-24 bg-#f7f7f7">
+            <up-swipe-action>
+                <up-swipe-action-item v-for="(item, index) in list" :key="index" :name="item?.id" :options="optionsActionTemp" @click="clickTempSwipe" class="mb-20 b-radius">
+                    <view class="b-radius bg-#fff pd-20 p-rtv" @click.stop="$u.route({ url: '/plant/storage/fresh-goods/detail/index', params: { id: item.id } })">
+                       
+                    </view>
+                </up-swipe-action-item>
+            </up-swipe-action>
+        </view>
+
+        <template #empty>
+            <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
+                <ut-empty class="mg-at" color="#ccc" size="28rpx">暂无包装赋码任务,点击下方+号新增吧</ut-empty>
+            </view>
+        </template>
+    </z-paging>
+    <ut-suspension @click="$u.route({ url: '/plant/packaging/create/index' })"></ut-suspension>
+</template>
+<script setup lang="ts">
+import { useClientRequest } from '@/utils/request';
+import { selectDictListClass } from '@/utils/ruoyi';
+import { getStorageRoomNames } from '@/utils/common';
+import FreshGoodsBottom from './model/fresh-goods-bottom.vue';
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { pt_pack_code_type } = toRefs<any>(proxy?.useDict('pt_pack_code_type'));
+const list = ref<any[]>();
+const form = ref({ keyword: '', restFlag: '1', processType: '', storageType: '5' });
+const paging = ref();
+const showAddDialog = ref(false);
+const tabs = ref([
+    { label: '有库存', value: '1' },
+    { label: '无库存', value: '0' },
+]);
+
+const changeSeach = () => {
+    paging.value.reload();
+};
+const query = async (pageNum: number, pageSize: number) => {
+    const params = {
+        pageNum,
+        pageSize,
+        ...form.value,
+    };
+    const res = await useClientRequest.get('/plt-api/app/packTask/list', params);
+    if (res) {
+        const { rows } = res;
+        paging.value.complete(rows);
+    }
+};
+// 暂存项左滑删除配置
+const optionsActionTemp = reactive([
+    {
+        text: '删除',
+        style: {
+            backgroundColor: '#F74C30',
+        },
+    },
+]);
+// 暂存项删除点击(本地移除)
+const clickTempSwipe = async (event: object) => {
+    const { name, index } = event as any;
+    if (index === 0) {
+        try {
+            const res = await uni.showModal({
+                title: '删除提示',
+                content: '确定删除鲜货信息吗?',
+                confirmColor: '#F74C30',
+            });
+            if (!res.confirm) return;
+            await uni.showLoading({
+                title: '删除中...',
+                mask: true,
+            });
+            await useClientRequest.get(`/plt-api/app/storage/removeById/${name}`);
+            uni.hideLoading();
+            uni.showToast({
+                title: '删除成功',
+                icon: 'success',
+            });
+            paging.value?.reload();
+        } catch (error) {
+            console.error('删除暂存鲜货信息失败:', error);
+        }
+    }
+};
+
+const onRefresh = () => {
+    paging.value.reload();
+};
+onMounted(() => {
+    uni.$on('refreshStorageRoomList', () => {
+        onRefresh();
+    });
+});
+</script>
+<style lang="scss" scoped>
+.search-select-item {
+    height: 86rpx;
+    background-color: #fff;
+    border-radius: 10rpx;
+    box-sizing: border-box;
+    padding: 12rpx;
+}
+.tag-span {
+    padding: 4rpx 12rpx;
+    font-size: 20rpx;
+    border-radius: 18rpx;
+}
+.li-item-head {
+    margin-left: -24rpx;
+    margin-top: -24rpx;
+}
+.li-left-tag {
+    padding: 6rpx 16rpx;
+    color: #fff;
+    border-radius: 16rpx 0 16rpx 0;
+    font-size: 20rpx;
+    font-weight: 500;
+}
+</style>

+ 37 - 37
src/plant/port/port-create/index.vue

@@ -29,7 +29,7 @@
                                 <view v-if="form.mgMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mg_method, form.mgMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择溯源级别</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -38,7 +38,7 @@
                                 <view v-if="form.gapFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_gap_flag, form.gapFlag) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择符合要求</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -75,7 +75,7 @@
                                 <view v-if="form.plantationMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_feeding_method, form.plantationMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择养殖方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -84,13 +84,13 @@
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
                                     <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择养殖开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                             <ut-datetime-picker v-model="form.queryType6.plannedEndDate" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.queryType6.plannedEndDate" placeholder="请选择养殖结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.queryType6.plannedEndDate" readonly placeholder="请选择养殖结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -123,7 +123,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -171,7 +171,7 @@
                                 <view v-if="form.mgMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mg_method, form.mgMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择溯源级别</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -208,7 +208,7 @@
                                 <view v-if="form.plantationMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_feeding_method, form.plantationMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择养殖方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -216,14 +216,14 @@
                         <up-form-item :borderBottom="false" label="养殖时间" required prop="queryType6">
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择养殖开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.queryType6.plannedStartDate" readonly placeholder="请选择养殖开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                             <ut-datetime-picker v-model="form.queryType6.plannedEndDate" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.queryType6.plannedEndDate" placeholder="请选择养殖结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.queryType6.plannedEndDate" readonly placeholder="请选择养殖结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -256,7 +256,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -294,7 +294,7 @@
                                 <view v-if="form.gapFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_task_gap_flag, form.gapFlag) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择符合要求</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -331,7 +331,7 @@
                                 <view v-if="form.plantationMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_plantation_method, form.plantationMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种植方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -357,7 +357,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -369,13 +369,13 @@
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
                                     <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                             <ut-datetime-picker v-model="form.queryType6.plannedEndDate" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.queryType6.plannedEndDate" placeholder="请选择种植结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.queryType6.plannedEndDate" readonly placeholder="请选择种植结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -384,7 +384,7 @@
                                 <view v-if="form.reproductionType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_reproduction_type, form.reproductionType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -393,7 +393,7 @@
                                 <view v-if="form.plantationType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_plantation_type, form.plantationType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种植类型</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -402,7 +402,7 @@
                                 <view v-if="form.sowingMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_sowing_method, form.sowingMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择播种方法</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -411,7 +411,7 @@
                                 <view v-if="form.transplantMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_transplant_method, form.transplantMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择移栽方法</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -495,7 +495,7 @@
                                 <view v-if="form.mgMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mg_method, form.mgMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择溯源级别</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -532,7 +532,7 @@
                                 <view v-if="form.plantationMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_plantation_method, form.plantationMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁育方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -541,13 +541,13 @@
                             <ut-datetime-picker v-model="form.queryType6.plannedStartDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
                                     <up-input v-model="form.queryType6.plannedStartDate" placeholder="请选择种植开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }" readonly></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                             <ut-datetime-picker v-model="form.queryType6.plannedEndDate" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.queryType6.plannedEndDate" placeholder="请选择种植结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.queryType6.plannedEndDate" readonly placeholder="请选择种植结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -573,7 +573,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -596,7 +596,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon class="mr-10" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon class="mr-10" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -628,7 +628,7 @@
                                 <view class="d-flex a-c">
                                     <view v-if="form.plant?.plantingMgUnit" class="f-s-30 c-333 f-w-5 w-100">{{ selectDictLabel(pt_feed_amount_unit, form.plant?.plantingMgUnit) }}</view>
                                     <view v-else class="f-s-30 c-ccc f-w-4 w-100">单位</view>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </view>
                             </ut-action-sheet>
                         </up-form-item> -->
@@ -648,7 +648,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -678,7 +678,7 @@
                                 <view v-if="form.reproductionType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_reproduction_type, form.reproductionType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择选择繁殖方式</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -687,7 +687,7 @@
                                 <view v-if="form.plantationType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_plantation_type, form.plantationType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种植类型</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -696,7 +696,7 @@
                                 <view v-if="form.sowingMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_sowing_method, form.sowingMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择播种方法</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -705,7 +705,7 @@
                                 <view v-if="form.transplantMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_transplant_method, form.transplantMethod) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择移栽方法</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>

+ 9 - 9
src/plant/port/port-harvest-create/index.vue

@@ -34,7 +34,7 @@
                                 <view v-if="form?.outputType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_output_type, form?.outputType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择采收类型</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -46,7 +46,7 @@
                                 <view v-if="form.seedType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_type, form?.seedType) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源类型</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </ut-action-sheet>
@@ -64,7 +64,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4">选择编号类型</view>
                                             </view>
                                             <template #right>
-                                                <up-icon class="pr-20" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon class="pr-20" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -83,16 +83,16 @@
                         <up-form-item :borderBottom="false" prop="harvestDate" id="harvestDatepppp">
                             <ut-datetime-picker v-model="form.harvestDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.harvestDate" placeholder="请选择采收开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.harvestDate" readonly placeholder="请选择采收开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
                         <up-form-item :borderBottom="false" prop="harvestDateEnd" id="harvestDateEndpppp">
                             <ut-datetime-picker v-model="form.harvestDateEnd" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.harvestDateEnd" placeholder="请选择采收结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.harvestDateEnd" readonly placeholder="请选择采收结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -129,7 +129,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -148,7 +148,7 @@
                             <view v-if="form.harvestType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_harvest_type, form.harvestType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择采收方式</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 6 - 6
src/plant/port/supervise/supervise-breeding-create/index.vue

@@ -12,14 +12,14 @@
                     <up-form-item :borderBottom="false" label="操作日期" required prop="operationDate">
                         <ut-datetime-picker v-model="form.operationDate.activityStart" mode="date" dateFields="day" @change="changeStartTime">
                             <view class="d-flex mr-20">
-                                <up-input v-model="form.operationDate.activityStart" placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityStart" readonly placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                         <ut-datetime-picker v-model="form.operationDate.activityEnd" mode="date" dateFields="day">
                             <view class="d-flex">
-                                <up-input v-model="form.operationDate.activityEnd" placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityEnd" readonly placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                     </up-form-item>
@@ -29,7 +29,7 @@
                             <view v-if="form.opMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_breed_op_method, form.opMethod) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择操作类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -39,7 +39,7 @@
                             <view v-if="form.opMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_op_method, form.opMethod) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择操作类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 5 - 5
src/plant/port/supervise/supervise-plant-create/index.vue

@@ -12,14 +12,14 @@
                     <up-form-item :borderBottom="false" label="操作日期" required prop="operationDate">
                         <ut-datetime-picker v-model="form.operationDate.activityStart" mode="date" dateFields="day" @change="changeStartTime">
                             <view class="d-flex mr-20">
-                                <up-input v-model="form.operationDate.activityStart" placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityStart" readonly placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                         <ut-datetime-picker v-model="form.operationDate.activityEnd" mode="date" dateFields="day">
                             <view class="d-flex">
-                                <up-input v-model="form.operationDate.activityEnd" placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityEnd" readonly placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                     </up-form-item>
@@ -29,7 +29,7 @@
                             <view v-if="form.opMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_op_method, form.opMethod) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择操作类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 5 - 5
src/plant/port/supervise/supervise-raising-create/index.vue

@@ -12,14 +12,14 @@
                     <up-form-item :borderBottom="false" label="操作日期" required prop="operationDate">
                         <ut-datetime-picker v-model="form.operationDate.activityStart" mode="date" dateFields="day" @change="changeStartTime">
                             <view class="d-flex mr-20">
-                                <up-input v-model="form.operationDate.activityStart" placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityStart" readonly placeholder="请选择操作开始时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                         <ut-datetime-picker v-model="form.operationDate.activityEnd" mode="date" dateFields="day">
                             <view class="d-flex">
-                                <up-input v-model="form.operationDate.activityEnd" placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="form.operationDate.activityEnd" readonly placeholder="请选择操作结束时间" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                     </up-form-item>
@@ -29,7 +29,7 @@
                             <view v-if="form.opMethod" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_raise_op_method, form.opMethod) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择操作类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 8 - 8
src/plant/processing/processing-create/index.vue

@@ -20,7 +20,7 @@
                             <view v-if="form?.processMedType" class="f-s-30 c-#333 f-w-5 flex1">{{ selectDictLabel(pt_stock_type, form.processMedType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工对象</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -28,14 +28,14 @@
                         <view v-if="form.varietyName" class="f-s-30 c-333 f-w-5 flex1">{{ form.varietyName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工品种</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                     <up-form-item v-if="+form?.processMedType == 2" @click="selectMedicine" borderBottom label="加工品种" required prop="medicineCode">
                         <view v-if="form.varietyName" class="f-s-30 c-333 f-w-5 flex1">{{ form.varietyName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工品种</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
 
@@ -44,16 +44,16 @@
                         <up-form-item :borderBottom="false" prop="processingDate">
                             <ut-datetime-picker v-model="form.processingDate" mode="date" dateFields="day" @change="changeStartTime">
                                 <view class="d-flex mr-20">
-                                    <up-input v-model="form.processingDate" placeholder="请选择加工开始日期" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.processingDate" readonly placeholder="请选择加工开始日期" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
                         <up-form-item :borderBottom="false" prop="processingDateEnd">
                             <ut-datetime-picker v-model="form.processingDateEnd" mode="date" dateFields="day">
                                 <view class="d-flex">
-                                    <up-input v-model="form.processingDateEnd" placeholder="请选择加工结束日期" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                    <up-input v-model="form.processingDateEnd" readonly placeholder="请选择加工结束日期" border="bottom" :customStyle="{ paddingLeft: '0rpx' }"></up-input>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                                 </view>
                             </ut-datetime-picker>
                         </up-form-item>
@@ -91,7 +91,7 @@
                             <view v-if="form?.standardType" class="f-s-30 c-#333 f-w-5 flex1">{{ selectDictLabel(pt_standard_type, form.standardType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择加工执行标准</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>

+ 3 - 3
src/plant/processing/processing-detail-list/models/outputInfo.vue

@@ -78,7 +78,7 @@
                                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">单位</view>
                                                 </view>
                                                 <template #right>
-                                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                                 </template>
                                             </up-form-item>
                                         </ut-action-sheet>
@@ -91,7 +91,7 @@
                                     <view v-if="formData?.finalFormType" class="f-s-30 c-#333 f-w-5 flex1">{{ selectDictLabel(pt_final_form_type, formData?.finalFormType) }}</view>
                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择切制形态</view>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-action-sheet>
@@ -117,7 +117,7 @@
                                                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">单位</view>
                                                 </view>
                                                 <template #right>
-                                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                                 </template>
                                             </up-form-item>
                                         </ut-action-sheet>

+ 1 - 1
src/plant/storage/agro-product/add/index.vue

@@ -81,7 +81,7 @@
                         <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none"
                             clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>

+ 5 - 5
src/plant/storage/agro-product/info-edit/index.vue

@@ -16,7 +16,7 @@
                         <view v-if="form.materialType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_material_type, form.materialType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择农资类别</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -40,7 +40,7 @@
                                         <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                     </view>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-action-sheet>
@@ -66,7 +66,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon class="mr-10" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon class="mr-10" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -93,7 +93,7 @@
                         <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_source_type, form.sourceType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择农资来源</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -119,7 +119,7 @@
                     <up-form-item borderBottom label="生产日期" prop="productDate">
                         <up-input v-model="form.productDate" readonly placeholder="请选择生产日期" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>

+ 6 - 6
src/plant/storage/agro-product/info-update/index.vue

@@ -19,7 +19,7 @@
                         <view v-if="form.materialType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_material_type, form.materialType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择农资类别</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -43,7 +43,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -75,7 +75,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon class="mr-10" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon class="mr-10" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -101,7 +101,7 @@
                         <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_source_type, form.sourceType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择农资来源</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -127,7 +127,7 @@
                     <up-form-item borderBottom label="生产日期" prop="productDate">
                         <up-input v-model="form.productDate" readonly placeholder="请选择生产日期" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>
@@ -168,7 +168,7 @@
                     <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
                         <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>

+ 1 - 1
src/plant/storage/fresh-goods/add/index.vue

@@ -67,7 +67,7 @@
                     <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
                         <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>

+ 6 - 6
src/plant/storage/fresh-goods/info-edit/index.vue

@@ -39,7 +39,7 @@
                     <up-form-item borderBottom label="药用部位/对象" prop="part" required>
                         <up-input v-model="form.partName" placeholder="请选择药用部位/对象" border="none" readonly clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </SelectMedicinalPart>
@@ -50,7 +50,7 @@
                         <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_medicine_source, form.sourceType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货来源</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -73,7 +73,7 @@
                                         <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                     </view>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-action-sheet>
@@ -107,7 +107,7 @@
                         <view v-if="form.producePlace" class="f-s-30 c-333 f-w-5 flex1">{{ form.producePlaceName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货产地</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </PickerAreaInput>
@@ -120,7 +120,7 @@
                                 <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
                                     <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-datetime-picker>
@@ -131,7 +131,7 @@
                                 <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
                                     <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-datetime-picker>

+ 9 - 9
src/plant/storage/fresh-goods/info-update/index.vue

@@ -45,7 +45,7 @@
                         <up-form-item borderBottom label="药用部位/对象" prop="part" required>
                             <up-input v-model="form.partName" placeholder="请选择药用部位/对象" border="none" readonly clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </SelectMedicinalPart>
@@ -56,7 +56,7 @@
                             <view v-if="form.sourceType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_medicine_source_tag, form.sourceType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货来源</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -93,7 +93,7 @@
                             <view v-if="form.producePlace" class="f-s-30 c-333 f-w-5 flex1">{{ form.producePlaceName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货产地</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </PickerAreaInput>
@@ -106,7 +106,7 @@
                                     <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
                                         <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-datetime-picker>
@@ -117,7 +117,7 @@
                                     <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
                                         <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-datetime-picker>
@@ -151,7 +151,7 @@
                         <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
                             <up-input v-model="form.instoreBizInfo.instoreDate" placeholder="请选择入库日期" border="none" clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-datetime-picker>
@@ -234,7 +234,7 @@
                             <view v-if="form.producePlace" class="f-s-30 c-333 f-w-5 flex1">{{ form.producePlaceName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择鲜货产地</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </PickerAreaInput>
@@ -247,7 +247,7 @@
                                     <up-form-item borderBottom prop="productDate" class="form-item-top-padding-0">
                                         <up-input v-model="form.productDate" readonly placeholder="请选择开始日期" border="none" clearable></up-input>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-datetime-picker>
@@ -258,7 +258,7 @@
                                     <up-form-item borderBottom prop="productDateEnd" class="form-item-top-padding-0">
                                         <up-input v-model="form.productDateEnd" readonly placeholder="请选择结束日期" border="none" clearable></up-input>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-datetime-picker>

+ 1 - 1
src/plant/storage/loss-register/index.vue

@@ -125,7 +125,7 @@
                         <up-form-item borderBottom label="损耗登记日期" required prop="scrapDate">
                             <up-input v-model="form.scrapDate" readonly placeholder="请选择损耗登记日期" border="none" clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-datetime-picker>

+ 6 - 3
src/plant/storage/medicine/list/index.vue

@@ -18,10 +18,13 @@
                     </ut-action-sheet>
                 </view>
                 <view class="h-86 pl-20 w-100%">
-                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜名称、批号、库房、供应商" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
+                    <ut-search ref="searchRef" v-model="form.keyword" @search="changeSeach" margin="0" :border="false" placeholder="搜动植物名称、品种、批号" bgColor="#fff" height="86rpx" borderRadius="10rpx"></ut-search>
                 </view>
             </view>
-            <view></view>
+            <view class="f-s-22 c-ccc pt-16">
+                <view>药材库仅对加工后待包装的药材做临时存放展示,不做信息修改。</view>
+                <view>如需修改信息,请前往加工模块-加工任务中进行修改。</view>
+            </view>
         </view>
         <view class="pd-24 bg-#f7f7f7">
             <up-swipe-action>
@@ -74,7 +77,7 @@
 
         <template #empty>
             <view class="d-flex flex-cln a-c" style="margin-top: -200rpx">
-                <ut-empty class="mg-at" color="#ccc" size="28rpx">暂无鲜货信息,点击下方+号新增吧</ut-empty>
+                <ut-empty class="mg-at" color="#ccc" size="28rpx">暂无药材信息</ut-empty>
             </view>
         </template>
     </z-paging>

+ 1 - 1
src/plant/storage/seed-source/add/index.vue

@@ -81,7 +81,7 @@
                     <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
                         <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none" clearable></up-input>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-datetime-picker>

+ 11 - 11
src/plant/storage/seed-source/info-edit/index.vue

@@ -12,7 +12,7 @@
                         <view v-if="form.seedType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_type, form.seedType) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源类型</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -54,7 +54,7 @@
                         <view v-if="form.seedSource" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_source, form.seedSource) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源来源</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -65,7 +65,7 @@
                             <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择父母本情况</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </template>
@@ -74,7 +74,7 @@
                             <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择父母本情况</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </template>
@@ -158,7 +158,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -183,7 +183,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                         </view>
                                         <template #right>
-                                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -218,7 +218,7 @@
                                         <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                     </view>
                                     <template #right>
-                                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-action-sheet>
@@ -255,7 +255,7 @@
                                         <view v-else class="f-s-30 c-ccc f-w-4">选择编号类型</view>
                                     </view>
                                     <template #right>
-                                        <up-icon class="pr-20" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                        <up-icon class="pr-20" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                     </template>
                                 </up-form-item>
                             </ut-action-sheet>
@@ -300,7 +300,7 @@
                         <view v-if="form.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.adcodeName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源产地</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </PickerAreaInput>
@@ -309,7 +309,7 @@
                         <view v-if="form.generationMaterial" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_breeding_materials, form.generationMaterial, ',') }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖材料</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -319,7 +319,7 @@
                         <view v-if="form.generationAdcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.generationAdcodeName }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖地点/采集地点</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </PickerAreaInput>

+ 16 - 16
src/plant/storage/seed-source/info-update/index.vue

@@ -18,7 +18,7 @@
                             <view v-if="form.seedType" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_type, form.seedType) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源类型</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -60,7 +60,7 @@
                             <view v-if="form.seedSource" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_seed_source, form.seedSource) }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源来源</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -71,7 +71,7 @@
                                 <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择父母本情况</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </template>
@@ -80,7 +80,7 @@
                                 <view v-if="form.instoreBizInfo.motherFatherFlag" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_mother_father_flag, form.instoreBizInfo.motherFatherFlag) }}</view>
                                 <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择父母本情况</view>
                                 <template #right>
-                                    <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                    <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                 </template>
                             </up-form-item>
                         </template>
@@ -164,7 +164,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -189,7 +189,7 @@
                                                 <view v-else class="f-s-30 c-ccc f-w-4 text-center">单位</view>
                                             </view>
                                             <template #right>
-                                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                             </template>
                                         </up-form-item>
                                     </ut-action-sheet>
@@ -239,7 +239,7 @@
                                             <view v-else class="f-s-30 c-ccc f-w-4">选择编号类型</view>
                                         </view>
                                         <template #right>
-                                            <up-icon class="pr-20" size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                            <up-icon class="pr-20" size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                                         </template>
                                     </up-form-item>
                                 </ut-action-sheet>
@@ -284,7 +284,7 @@
                             <view v-if="form.adcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.adcodeName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择种源产地</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </PickerAreaInput>
@@ -293,7 +293,7 @@
                             <view v-if="form.generationMaterial" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_breeding_materials, form.generationMaterial, ',') }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖材料</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -303,7 +303,7 @@
                             <view v-if="form.generationAdcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.generationAdcodeName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖地点/采集地点</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </PickerAreaInput>
@@ -337,9 +337,9 @@
                     <view class="h-1" id="instoreDatepppp"></view>
                     <ut-datetime-picker v-model="form.instoreBizInfo.instoreDate" :maxDate="new Date()" mode="date">
                         <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
-                            <up-input v-model="form.instoreBizInfo.instoreDate" placeholder="请选择入库日期" border="none" clearable></up-input>
+                            <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none" clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-datetime-picker>
@@ -456,7 +456,7 @@
                             <view v-if="form.generationMaterial" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabels(pt_breeding_materials, form.generationMaterial, ',') }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖材料</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-action-sheet>
@@ -466,7 +466,7 @@
                             <view v-if="form.generationAdcode" class="f-s-30 c-333 f-w-5 flex1">{{ form.generationAdcodeName }}</view>
                             <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择繁殖地点/采集地点</view>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </PickerAreaInput>
@@ -500,9 +500,9 @@
                     <view class="h-1" id="instoreDatepppp"></view>
                     <ut-datetime-picker v-model="form.instoreBizInfo.instoreDate" :maxDate="new Date()" mode="date">
                         <up-form-item borderBottom label="入库日期" required prop="instoreBizInfo.instoreDate">
-                            <up-input v-model="form.instoreBizInfo.instoreDate" placeholder="请选择入库日期" border="none" clearable></up-input>
+                            <up-input v-model="form.instoreBizInfo.instoreDate" readonly placeholder="请选择入库日期" border="none" clearable></up-input>
                             <template #right>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                             </template>
                         </up-form-item>
                     </ut-datetime-picker>

+ 2 - 2
src/plant/storage/storage-room/edit/index.vue

@@ -14,7 +14,7 @@
                         <view v-if="form.type" class="f-s-30 c-333 f-w-5 flex1">{{ selectDictLabel(pt_warehouse_type, form.type) }}</view>
                         <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择库房类型</view>
                         <template #right>
-                            <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                            <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                         </template>
                     </up-form-item>
                 </ut-action-sheet>
@@ -39,7 +39,7 @@
                     <view v-if="form.contact" class="f-s-30 c-333 f-w-5 flex1">{{ form.contactName }}</view>
                     <view v-else class="f-s-30 c-ccc f-w-4 flex1">请选择负责人</view>
                     <template #right>
-                        <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill"></up-icon>
+                        <up-icon size="22rpx" color="#37A954" name="arrow-down-fill"></up-icon>
                     </template>
                 </up-form-item>
                 <!-- 填写基地联系电话 -->

+ 2 - 2
src/tools/species-info/index.vue

@@ -46,8 +46,8 @@
                     <up-form-item :borderBottom="false" required label="种源投入时间" prop="useDate" id="useDatepppp">
                         <ut-datetime-picker v-model="formDate.useDate" mode="date" dateFields="day" style="width: 100%">
                             <view class="d-flex">
-                                <up-input v-model="formDate.useDate" placeholder="默认种养殖开始时间但可修改" border="bottom"></up-input>
-                                <up-icon size="22rpx" color="#2A6D52" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
+                                <up-input v-model="formDate.useDate" readonly placeholder="默认种养殖开始时间但可修改" border="bottom"></up-input>
+                                <up-icon size="22rpx" color="#37A954" name="arrow-down-fill" style="margin-left: -20rpx"></up-icon>
                             </view>
                         </ut-datetime-picker>
                     </up-form-item>

+ 35 - 0
src/tools/view-html/index.vue

@@ -0,0 +1,35 @@
+<template>
+    <z-paging ref="paging" safe-area-inset-bottom scroll-with-animation>
+        <template #top>
+            <ut-navbar :title="title" :fixed="false" border></ut-navbar>
+        </template>
+        <view class="p-rtv pd-20 c-#333 f-s-28 lh-1.6">
+            <up-parse :content="content"></up-parse>
+        </view>
+    </z-paging>
+</template>
+<script setup lang="ts">
+import { recursiveDecodeURIComponentSimple } from '@/utils/ruoyi';
+
+const content = ref<string>('');
+const title = ref('');
+const paging = ref();
+
+onLoad((options) => {
+    // 设置标题
+    const obj = recursiveDecodeURIComponentSimple(options);
+    console.log(obj);
+    
+    uni.setNavigationBarTitle({ title: obj?.title || '-' });
+    title.value = obj.title || '-';
+    obj.url && uni.request({
+        url: obj.url,
+        success: (res: any) => {
+            // 只要body内容
+            console.log(res);
+            
+            content.value = res.data as string;
+        },
+    });
+});
+</script>