Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -582,36 +582,36 @@
 <!--              </el-form-item>-->
 <!--            </el-col>-->
             <!-- 多次发料 -->
-<!--            <el-col key="多次发料col" :span="7">-->
-<!--              <el-form-item key="多次发料formItem" label="多次发料">-->
-<!--                <el-switch  key="多次发料"-->
-<!--                  v-model="formData.configuration.IsSplit"-->
-<!--                  active-value="TRUE"-->
-<!--                  inactive-value="FALSE"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <el-col key="多次发料col" :span="7">
+              <el-form-item key="多次发料formItem" label="多次发料">
+                <el-switch  key="多次发料"
+                  v-model="formData.configuration.IsSplit"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
             <!-- 拆分次数 -->
-<!--            <el-col key="拆分次数col" :span="8">-->
-<!--              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">-->
-<!--                <el-input-number key="拆分次数"-->
-<!--                  v-model="formData.configuration.EachTimeQty"-->
-<!--                  :min="0"-->
-<!--                  controls-position="right"-->
-<!--                />-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <el-col key="拆分次数col" :span="8">
+              <el-form-item key="拆分次数formItem" label="拆分次数" label-width="70px">
+                <el-input-number key="拆分次数"
+                  v-model="formData.configuration.EachTimeQty"
+                  :min="0"
+                  controls-position="right"
+                />
+              </el-form-item>
+            </el-col>
             <!-- 时间间隔 -->
-<!--            <el-col key="时间间隔col" :span="9">-->
-<!--              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">-->
-<!--                <el-input-number key="时间间隔"-->
-<!--                  v-model="formData.configuration.TimeInterval"-->
-<!--                  :min="0"-->
-<!--                  style="flex: 1; margin-right: 10px"-->
-<!--                  controls-position="right"-->
-<!--                />小时-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
+            <el-col key="时间间隔col" :span="9">
+              <el-form-item key="时间间隔formItem" label="时间间隔" label-width="70px">
+                <el-input-number key="时间间隔"
+                  v-model="formData.configuration.TimeInterval"
+                  :min="0"
+                  style="flex: 1; margin-right: 10px"
+                  controls-position="right"
+                />小时
+              </el-form-item>
+            </el-col>
             <!-- 使用整理库位-->
 <!--            <el-col key="使用整理库位col" :span="24">-->
 <!--              <el-form-item key="使用整理库位formItem" label="使用整理库位">-->

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@@ -282,6 +282,16 @@
                 <el-switch v-model="formData.configuration.emailNotification" />
               </el-form-item>
             </el-col>
+            <!-- 邮箱地址 -->
+            <el-col :span="24">
+              <el-form-item label="邮箱地址"
+                            prop="configuration.emailAddress"
+                            :rules="[
+                  { required: true, message: '请输入邮箱地址', trigger: 'change' },
+                ]">
+                <el-input v-model="formData.configuration.emailAddress" />
+              </el-form-item>
+            </el-col>
           </el-row>
         </div>
       </el-form>
@@ -341,7 +351,8 @@ const formData = ref({
     // 自动补料
     autoFeed: false, 
     // 邮件提醒
-    emailNotification: true 
+    emailNotification: true,
+    emailAddress:''
   }
 })
 
@@ -606,7 +617,8 @@ const resetForm = () => {
       // 自动补料
       autoFeed: false, 
       // 邮件提醒
-      emailNotification: true 
+      emailNotification: true,
+      emailAddress:''
     }
   }
 }

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -555,7 +555,7 @@ export const DemandforecastingMainPlan = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '计划日期',
     field: 'dueDate',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue

@@ -283,6 +283,10 @@ const handlePreviewPlan = async ()=>{
   await getListPlan()
   selectionPlanRows.value = []
   dialogVisiblePlan.value = true
+  // 全选
+  nextTick(()=>{
+    tablePlanRef.value.toggleAllSelection(true)
+  })
 }
 
 const buttonBaseClickPlan = async (val)=>{

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -465,7 +465,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       component: 'InputNumber',
       componentProps: {
         precision: 2,
-        disabled: true,
+        disabled: false,
       }
     },
     isTableForm:false,