Merge remote-tracking branch 'origin/cjerp-1.0_20251220' into cjerp-1.0_shipping

# Conflicts: # pages/credit_manage/index.vue

Merge remote-tracking branch 'origin/cjerp-1.0_20251220' into cjerp-1.0_shipping
# Conflicts: # pages/credit_manage/index.vue
史婷婷
2 parents 4a06e5a0 56a6eba8
Showing 11 changed files with 41 additions and 15 deletions
README.en.md
README.md
manifest.json
pages/change_list/index.vue
pages/contract_framework/index.vue
pages/credit_manage/add.vue
pages/credit_manage/change.vue
pages/credit_manage/modify.vue
pages/dev_manage/index.vue
pages/order_list/index.vue
pages/revoke_list/index.vue
--- a/README.en.md
View file @8f9b5a4
+++ b/README.en.md
View file @8f9b5a4
-# 配套 星云erp-手机版
+# 配套 楚江erp-手机版
 #### Description
-一套比较火的erp移动版配套，选了 星云erp v3版。功能和星云erp pc版1比1。完全没有商用限制。技术探讨请加QQ：3783722918。为了更好完善更多功能也欢迎加入我们团队成为共同开发者。
+一套比较火的erp移动版配套，选了 楚江erp v3版。功能和楚江erp pc版1比1。完全没有商用限制。技术探讨请加QQ：3783722918。为了更好完善更多功能也欢迎加入我们团队成为共同开发者。
 #### Software Architecture
 Software architecture description
--- a/README.md
View file @8f9b5a4
+++ b/README.md
View file @8f9b5a4
@@ -110,8 +110,8 @@
 * 运行项目，到浏览器或者小程序即可运行
 ### 特别鸣谢
-排名不分先后，感谢这些软件的开发者：星云erp、vue、echarts、tree-table-vue、swiper、form-create等，如有遗漏请联系我！
+排名不分先后，感谢这些软件的开发者：楚江erp、vue、echarts、tree-table-vue、swiper、form-create等，如有遗漏请联系我！
 ### 免责声明
-因为接口端直接使用 星云erp，接口端请自行遵守原作的协议。移动版不受限。
+因为接口端直接使用 楚江erp，接口端请自行遵守原作的协议。移动版不受限。
--- a/manifest.json
View file @8f9b5a4
+++ b/manifest.json
View file @8f9b5a4
 {
-    "name" : "星云erp",
+    "name" : "楚江erp",
     "appid" : "__UNI__7F58F77",
     "description" : "",
     "versionName" : "1.1.0",
@@ -60,7 +60,7 @@
             "port" : 9090,
             "https" : false
         },
-        "title" : "星云ERP",
+        "title" : "楚江ERP",
         "router" : {
             "mode" : "hash",
             "base" : "./"
--- a/pages/change_list/index.vue
View file @8f9b5a4
+++ b/pages/change_list/index.vue
View file @8f9b5a4
@@ -43,7 +43,7 @@
           <view class="form-item">
             <view class="label">订货日期</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)"/>
           </view>
         </view>
       </template>
@@ -137,6 +137,10 @@ export default {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.examineStatus = raw
     },
+    onDateChange(e, model) {
+      // 确保同步更新 filterForm，避免数据不同步
+      this.filterForm.dateRange = e
+    },
     onLoaded({ items }) { this.currentItems = items || [] },
     onError() { uni.showToast({ title: '列表加载失败', icon: 'none' }) },
     fetchList({ pageIndex, pageSize, query, extra }) {
--- a/pages/contract_framework/index.vue
View file @8f9b5a4
+++ b/pages/contract_framework/index.vue
View file @8f9b5a4
@@ -48,7 +48,7 @@
           </view>
           <view class="form-item">
             <view class="label">授权截止时间</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)" />
           </view>
         </view>
       </template>
@@ -168,6 +168,11 @@ export default {
       this.filterForm.materialTypeId = raw
     },
+    onDateChange(e, model) {
+      // 确保同步更新 filterForm，避免数据不同步
+      this.filterForm.dateRange = e
+    },
+
     onAdd() {
       uni.navigateTo({ url: '/pages/contract_framework/add' })
     },
--- a/pages/credit_manage/add.vue
View file @8f9b5a4
+++ b/pages/credit_manage/add.vue
View file @8f9b5a4
@@ -143,7 +143,7 @@
         </uni-list-item>
         <uni-list-item title="员工人数">
           <template v-slot:footer>
-            <uni-easyinput type="number" v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
+            <uni-easyinput v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="设备属性">
--- a/pages/credit_manage/change.vue
View file @8f9b5a4
+++ b/pages/credit_manage/change.vue
View file @8f9b5a4
@@ -142,7 +142,7 @@
         </uni-list-item>
         <uni-list-item title="员工人数">
           <template v-slot:footer>
-            <uni-easyinput type="number" v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
+            <uni-easyinput v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="设备属性">
--- a/pages/credit_manage/modify.vue
View file @8f9b5a4
+++ b/pages/credit_manage/modify.vue
View file @8f9b5a4
@@ -141,7 +141,7 @@
         </uni-list-item>
         <uni-list-item title="员工人数">
           <template v-slot:footer>
-            <uni-easyinput type="number" v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
+            <uni-easyinput v-model="form.employeeCount" placeholder="请输入员工人数" :inputBorder="false" />
           </template>
         </uni-list-item>
         <uni-list-item title="设备属性">
--- a/pages/dev_manage/index.vue
View file @8f9b5a4
+++ b/pages/dev_manage/index.vue
View file @8f9b5a4
@@ -84,7 +84,8 @@
 					</view>
 					<view class="form-item">
 						<view class="label">创建时间</view>
-						<uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+						<uni-datetime-picker type="daterange" :value="model.dateRange" start="2023-01-01"
+							@change="onDateChange($event, model)" />
 					</view>
 				</view>
 			</template>
@@ -299,11 +300,16 @@
 				this.officeSelectVisible = true
 			},
 			onOfficeConfirm(payload) {
+				console.log('onOfficeConfirm__this.filterForm', this.filterForm)
 				const val = payload && payload.value != null ? payload.value : ''
 				const label = payload && payload.label != null ? payload.label : ''
 				this.filterForm.officeId = val
 				this.filterForm.officeName = label
 			},
+			onDateChange(e, model) {
+				// 确保同步更新 filterForm，避免数据不同步
+				this.filterForm.dateRange = e
+			},
 			toggleBatch() {
 				this.batchMode = !this.batchMode
 				if (!this.batchMode) this.selectedKeys = []
--- a/pages/order_list/index.vue
View file @8f9b5a4
+++ b/pages/order_list/index.vue
View file @8f9b5a4
@@ -43,7 +43,7 @@
           <view class="form-item">
             <view class="label">办事处</view>
             <uni-easyinput v-model="model.deptName" placeholder="请输入办事处" :inputBorder="false"
-              placeholderStyle="font-size:14px" />
+              placeholderStyle="font-size:14px" @input="onDeptNameInput" />
           </view>
           <view class="form-item">
@@ -66,7 +66,7 @@
           <view class="form-item">
             <view class="label">订货日期</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)" />
           </view>
         </view>
       </template>
@@ -215,6 +215,13 @@ export default {
         type: this.tabValue || ''
       }
     },
+    onDateChange(e, model) {
+      // 确保同步更新 filterForm，避免数据不同步
+      this.filterForm.dateRange = e
+    },
+    onDeptNameInput(val) {
+      this.filterForm.deptName = val
+    },
     onLoaded({ items }) { this.currentItems = items || [] },
     onError() { uni.showToast({ title: '列表加载失败', icon: 'none' }) },
     fetchList({ pageIndex, pageSize, query, extra }) {
--- a/pages/revoke_list/index.vue
View file @8f9b5a4
+++ b/pages/revoke_list/index.vue
View file @8f9b5a4
@@ -42,7 +42,7 @@
           <view class="form-item">
             <view class="label">订货日期</view>
-            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" />
+            <uni-datetime-picker type="daterange" v-model="model.dateRange" start="2023-01-01" @change="onDateChange($event, model)" />
           </view>
         </view>
       </template>
@@ -136,6 +136,10 @@ export default {
       const raw = e && e.detail && e.detail.value !== undefined ? e.detail.value : (e && e.value !== undefined ? e.value : '')
       this.filterForm.status = raw
     },
+    onDateChange(e, model) {
+      // 确保同步更新 filterForm，避免数据不同步
+      this.filterForm.dateRange = e
+    },
     onLoaded({ items }) { this.currentItems = items || [] },
     onError() { uni.showToast({ title: '列表加载失败', icon: 'none' }) },
     fetchList({ pageIndex, pageSize, query, extra }) {