diff --git a/common/api.js b/common/api.js
index 954fe3a..f8e52d6 100644
--- a/common/api.js
+++ b/common/api.js
@@ -184,6 +184,7 @@ module.exports = (vm) => {
       cancelBidding: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/cancelBidding', data),
       delete: data => vm.$u.http.post( freightAPI + '/freightGoodsSourceV2/delete', data),
       buildMaQrcode: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/buildMaQrcode', {params}),
+      getLatestRemark: params => vm.$u.http.get( freightAPI + '/freightGoodsSourceV2/getHistoryRemark', params), // 使用的历史备注
     }
   };
 }
diff --git a/pages.json b/pages.json
index f128031..002e910 100644
--- a/pages.json
+++ b/pages.json
@@ -28,6 +28,11 @@
 				"navigationBarTitleText": "创建货源"
 			}
 		},{
+			"path": "pages/goodSource/select-remark",
+			"style": {
+				"navigationBarTitleText": "填写备注"
+			}
+		},{
 			"path": "pages/goodSource/detail",
 			"style": {
 				"navigationBarTitleText": "飞牛货源详情",
diff --git a/pages/goodSource/add.vue b/pages/goodSource/add.vue
index 6af7700..c11c13f 100644
--- a/pages/goodSource/add.vue
+++ b/pages/goodSource/add.vue
@@ -74,8 +74,8 @@
         </view>
         <template v-if="more">
           <view class="card">
-            <u-form-item label="订单备注">
-              <u-input v-model="form.remark" border="none" placeholder="请输入，选填" />
+            <u-form-item label="订单备注" @click="selectRemark">
+              <u-input v-model="form.remark" border="none" placeholder="请输入，选填" suffix-icon="arrow-right" disabledColor="#ffffff" disabled />
             </u-form-item>
           </view>
           <view class="card">
@@ -112,6 +112,16 @@
         </view>
       </view>
     </tui-bottom-popup>
+    <u-picker
+      ref="picker"
+      :show="priceTypeVisible"
+      :columns="priceTypeColumns"
+      @confirm="priceTypeConfirm"
+      @cancel="priceTypeVisible = false"
+      key-name="valueName"
+      :default-index="[1]"
+      immediate-change
+    />
     <u-toast ref="uToast"></u-toast>
   </Page>
 </template>
@@ -124,6 +134,7 @@ export default {
   data() {
     return {
       loading: false,
+      priceTypeVisible: false,
       showLoadTime1: false,
       showLoadTime2: false,
       loadTimeDef1: new Date(),
@@ -198,6 +209,9 @@ export default {
       }
       return res.join('/');
     },
+    priceTypeColumns() {
+      return [this.dictList('FREIGHT_GOODS_SOURCE_PRICE_TYPE')];
+    },
   },
   onLoad(option) {
     if (option.code) {
@@ -242,15 +256,8 @@ export default {
         }
       });
     },
-    // selectRemark() {
-    //   uni.$once('select-remark', remark => {
-    //     this.form.remark = remark || '';
-    //   });
-    //   uni.navigateTo({
-    //     url: `/pages/order/select-remark`,
-    //   });
-    // },
     choseProjectCode() {
+      uni.$off('select-common');
       uni.$once('select-common', option => {
         this.form.projectCode = option.code;
         this.form.projectName = option.name;
@@ -294,19 +301,17 @@ export default {
       }
       this.form.specification = this.choseSpecificationList.join(',');
     },
+    priceTypeConfirm(v) {
+      let option = v.value[0];
+      this.form.priceType = option.valueCode;
+      this.form.priceTypeName = option.valueName;
+      this.priceTypeVisible = false;
+    },
     chosePriceType() {
-      uni.$once('select-dict', option => {
-        this.form.priceType = option.valueCode;
-        this.form.priceTypeName = option.valueName;
-      });
-      uni.navigateTo({
-        url: `/pages/global/search-dict${urlParam({
-          title: '计价方式',
-          dict: 'FREIGHT_GOODS_SOURCE_PRICE_TYPE',
-        })}`,
-      });
+      this.priceTypeVisible = true;
     },
     choseGoodsName() {
+      uni.$off('select-common');
       uni.$once('select-common', option => {
         this.form.goodsName = option.name;
       });
@@ -362,6 +367,14 @@ export default {
       this.form.endTime = dayjs(value).format('YYYY-MM-DD HH:mm:ss');
       this.showLoadTime2 = false;
     },
+    selectRemark() {
+      uni.$once('select-remark', remark => {
+        this.form.remark = remark || '';
+      });
+      uni.navigateTo({
+        url: `/pages/goodSource/select-remark`,
+      });
+    },
     submitAddFun() {
       if (this.loading) return;
       this.loading = true;
diff --git a/pages/goodSource/select-remark.vue b/pages/goodSource/select-remark.vue
new file mode 100644
index 0000000..db754d9
--- /dev/null
+++ b/pages/goodSource/select-remark.vue
@@ -0,0 +1,71 @@
+<template>
+  <Page name="select-remark" flank>
+    <template #content>
+      <u-textarea placeholder="请输入，点击历史备注快捷填写" v-model="remark"></u-textarea>
+      <view class="his-title">历史备注</view>
+      <view class="his-card">
+        <view @click="clickItem(item)" class="his-item" v-for="(item, index) in hisList" :key="index">
+          <text>{{ item }}</text>
+        </view>
+      </view>
+    </template>
+    <template #footer>
+      <u-button type="primary" @click="onSelect">确定</u-button>
+    </template>
+  </Page>
+</template>
+<script>
+export default {
+  name: 'select-remark',
+  data() {
+    return {
+      remark: '',
+      hisList: [],
+    };
+  },
+  onLoad(option) {
+    this.remark = option.remark || '';
+    this.getHis();
+  },
+  methods: {
+    getHis() {
+      uni.$u.api.freightGoodsSourceV2.getLatestRemark({}).then(res => {
+        this.hisList = res.result || [];
+      });
+    },
+    clickItem(v) {
+      this.remark = v;
+    },
+    onSelect() {
+      uni.$emit('select-remark', this.remark);
+      uni.navigateBack();
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+.page-select-remark {
+  &__content {
+    .his-title {
+      padding: $padding-xs 0;
+    }
+    .his-card {
+      padding: $padding-md $padding-xs;
+      border-radius: $radius-md;
+      background: $color-white;
+      .his-item {
+        padding: $padding-xs 0;
+        color: $color-text-minor;
+        border-bottom: 1px solid $color-border;
+        text {
+          overflow-wrap: anywhere;
+        }
+      }
+      .his-item:last-child {
+        border-bottom: none;
+      }
+    }
+  }
+}
+</style>
--
libgit2 0.21.0