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

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

@@ -1,12 +1,12 @@
 <!-- 到货验货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <!-- 规则 -->
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left">
         <div class="item">
           <div class="title">规则</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
                 <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
@@ -37,7 +37,7 @@
         <!-- 规则条件 -->
         <div class="item mt-20px">
           <div class="title">规则条件</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 供应商类型 -->
               <el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" class="flex-top err-120">
@@ -67,7 +67,7 @@
         <!-- 规则配置 -->
         <div class="item mt-20px">
           <div class="title">规则配置</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 按零件拆分 -->
               <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分">
@@ -276,7 +276,7 @@ const resetForm = () => {
       { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
     ],
     configuration: [
-       // 按零件拆分
+      // 按零件拆分
       { ParamCode: 'ByItem', Value: false },
       // 按批次拆分
       { ParamCode: 'ByBatch', Value: false },

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

@@ -1,7 +1,7 @@
 <!-- 批次策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width:800px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">
@@ -300,7 +300,7 @@ const submitForm = async () => {
   if (!formRef) return
   const valid = await formRef.value.validate()
   if (!valid) return
-  
+
   // 提交请求
   formLoading.value = true
   try {
@@ -390,7 +390,7 @@ const handleDeleteTable = (item, cur, key) => {
 }
 //失去焦点的时候验证
 const inputBlur = () => {
- let arr = []
+  let arr = []
   formData.value.configuration.forEach(item => {
     let bol = false
     item.Value.forEach(cur => {

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

@@ -1,7 +1,7 @@
 <!-- 下架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+      <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+        <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">

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

@@ -1,8 +1,8 @@
 
 <!-- 检验策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">

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

@@ -1,7 +1,7 @@
 <!-- 管理精度策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">

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

@@ -1,13 +1,13 @@
 
 <!-- 采购收货任务拆分策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+      <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <!-- 规则 -->
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left">
         <div class="item">
           <div class="title">规则</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24">
               <el-form-item label="代码" prop="strategyCode">
                 <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
@@ -38,7 +38,7 @@
         <!-- 规则条件 -->
         <div class="item mt-20px">
           <div class="title">规则条件</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 供应商类型 -->
               <el-form-item v-if="item.ParamCode == 'SupplierType'" label="供应商类型" class="flex-top err-120">
@@ -68,7 +68,7 @@
         <!-- 规则配置 -->
         <div class="item mt-20px">
           <div class="title">规则配置</div>
-          <el-row>
+          <el-row gutter="10">
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 按零件拆分 -->
               <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分">

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

@@ -1,7 +1,7 @@
 <!-- 补料策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">
@@ -393,12 +393,12 @@ const buttonBaseClick = (val, item) => {
 
 const validatorNum = (rule: any, value: any, callback: any) => {
   if (value && formData.value.configuration[0].Value != -1) {
-      if (value > formData.value.configuration[0].Value){
+    if (value > formData.value.configuration[0].Value) {
-        callback(new Error("11"))
+      callback(new Error("11"))
-      }else{
+    } else {
-        
+
       callback()
-      }
+    }
   } else {
     callback()
   }
@@ -444,4 +444,5 @@ const validatorNum = (rule: any, value: any, callback: any) => {
 
 ::v-deep .err-130 .el-form-item__error {
   padding-left: 130px !important;
-}</style>
+}
+</style>

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

@@ -1,7 +1,7 @@
 <!-- 存储容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">

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

@@ -1,8 +1,8 @@
 
 <!-- 供应商送货策略弹出层 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 800px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">

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

@@ -1,7 +1,7 @@
 <!-- 上架策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+      <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+        <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
           <div class="item">

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

@@ -1,7 +1,7 @@
 <!-- 器具容量策略弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+    <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">
@@ -41,21 +41,20 @@
           <el-row gutter="10">
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 器具类型 -->
-               <el-form-item label="器具类型" class="err-120" v-if="index == 0" :prop="'condition.' + index + '.Value'"
+              <el-form-item label="器具类型" class="err-120" v-if="index == 0" :prop="'condition.' + index + '.Value'" :rules="{
-                  :rules="{
+                required: true,
-                    required: true,
+                message: '请选择器具类型',
-                    message: '请选择器具类型',
+                trigger: 'change',
-                    trigger: 'change',
+              }">
-                  }">
+                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
+                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
+                    :key="cur.value" />
-                      :key="cur.value" />
+                </el-select>
-                  </el-select>
+                <el-select v-model="item.Value" placeholder="请选择器具类型" style="flex: 1;" clearable>
-                  <el-select v-model="item.Value" placeholder="请选择器具类型" style="flex: 1;" clearable>
+                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)" :key="cur.value"
-                    <el-option v-for="cur in getStrDictOptions(DICT_TYPE.CONTAINER_TYPE)" :key="cur.value" :label="cur.label"
+                    :label="cur.label" :value="cur.value" />
-                      :value="cur.value" />
+                </el-select>
-                  </el-select>
+              </el-form-item>
-                </el-form-item>
               <!-- 选择物品类型 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
                 <el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"

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

@@ -1,7 +1,7 @@
 <!-- 库位存储策略弹窗弹窗 -->
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+      <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-    <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+        <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="130px" label-position="left">
         <!-- 规则 -->
         <div class="item">