策略

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

@@ -5,13 +5,12 @@
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
       <!-- 规则 -->
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="140px" label-position="left">
-        <el-row>
-          <el-col :span="24">
         <div class="item">
           <div class="title">规则</div>
+          <el-row>
             <el-col :span="24">
-                <el-form-item label="代码" prop="code">
+              <el-form-item label="代码" prop="strategyCode">
-                  <el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -34,12 +33,12 @@
                 <el-switch v-model="formData.status" />
               </el-form-item>
             </el-col>
+          </el-row>
         </div>
-          </el-col>
         <!-- 规则条件 -->
-          <el-col :span="24">
         <div class="item mt-20px">
           <div class="title">规则条件</div>
+          <el-row>
             <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">
@@ -65,12 +64,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
+          </el-row>
         </div>
-          </el-col>
         <!-- 规则配置 -->
-          <el-col :span="24">
         <div class="item mt-20px">
           <div class="title">规则配置</div>
+          <el-row>
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 按零件拆分 -->
               <el-form-item v-if="item.ParamCode == 'ByItem'" label="按零件拆分" :prop="'configuration.' + index + '.Value'"
@@ -110,9 +109,8 @@
                 <el-input-number v-model="item.Value" :min="0" />
               </el-form-item>
             </el-col>
-            </div>
-          </el-col>
           </el-row>
+        </div>
       </el-form>
     </div>
     <template #footer>
@@ -150,7 +148,6 @@ const formStrategyCode = ref('')
 const formData = ref({
   id: '',
   strategyCode: formStrategyCode.value,//策略代码id
-  code: formStrategyCode.value,//规则代码
   name: '',//名称
   description: '',//描述
   priority: '',//优先级
@@ -267,7 +264,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       let data = await RuleApi.getRule(id)
       formData.value.id = data.id
       formData.value.strategyCode = data.strategyCode
-      formData.value.code = data.code
       formData.value.name = data.name
       formData.value.description = data.description
       formData.value.priority = data.priority
@@ -302,7 +298,6 @@ const submitForm = async () => {
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode,//策略代码
-      code: formData.value.code,//规则代码
       name: formData.value.name,//名称
       description: formData.value.description,//描述
       priority: formData.value.priority,//优先级
@@ -331,7 +326,6 @@ const resetForm = () => {
   formData.value = {
     id: '',
     strategyCode: formStrategyCode.value,//策略代码
-    code: formStrategyCode.value,//规则代码
     name: '',//名称
     description: '',//描述
     priority: '',//优先级

src/views/wms/strategy/purchaseReceiptStrategy/index.vue

@@ -12,10 +12,9 @@
       <el-table-column align="center" label="优先级" prop="priority" />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status ? 0 : 1" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
           <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />

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

@@ -4,14 +4,13 @@
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
       <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
-        <el-row>
         <!-- 规则 -->
-          <el-col :span="24">
         <div class="item">
           <div class="title">规则</div>
+          <el-row>
             <el-col :span="24">
-                <el-form-item label="代码" prop="code">
+              <el-form-item label="代码" prop="strategyCode">
-                  <el-input v-model="formData.code" placeholder="请输入代码" clearable disabled />
+                <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -34,12 +33,12 @@
                 <el-switch v-model="formData.status" />
               </el-form-item>
             </el-col>
+          </el-row>
         </div>
-          </el-col>
         <!-- 规则条件 -->
-          <el-col :span="24">
         <div class="item mt-20px">
           <div class="title">规则条件</div>
+          <el-row>
             <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">
@@ -77,17 +76,17 @@
                 </div>
               </el-form-item>
             </el-col>
+          </el-row>
         </div>
-          </el-col>
         <!-- 规则配置 -->
-          <el-col :span="24">
         <div class="item mt-20px">
           <div class="title">规则配置</div>
+          <el-row>
             <!-- 开始时间 -->
             <el-col :span="24" v-for="(item, index) in formData.configuration" :key="index">
               <!-- 开始时间 -->
-                <el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间"
+              <el-form-item v-if="item.ParamCode == 'BeginTime'" label="开始时间" :prop="'configuration.' + index + '.Value'"
-                  :prop="'configuration.' + index + '.Value'" :rules="{
+                :rules="{
                   required: true,
                   message: '请选择开始时间',
                   trigger: 'change',
@@ -139,10 +138,8 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            </div>
-          </el-col>
-
           </el-row>
+        </div>
       </el-form>
     </div>
     <template #footer>
@@ -180,7 +177,6 @@ const formStrategyCode = ref('')
 const formData = ref({
   id: '',
   strategyCode: formStrategyCode.value,//策略代码id
-  code: formStrategyCode.value,//规则代码
   name: '',//名称
   description: '',//描述
   priority: '',//优先级
@@ -305,7 +301,6 @@ const open = async (type: string, strategyCode: string, id?: number) => {
       let data = await RuleApi.getRule(id)
       formData.value.id = data.id
       formData.value.strategyCode = data.strategyCode
-      formData.value.code = data.code
       formData.value.name = data.name
       formData.value.description = data.description
       formData.value.priority = data.priority
@@ -340,7 +335,6 @@ const submitForm = async () => {
     let data = {
       id: formData.value.id,
       strategyCode: formData.value.strategyCode,//策略代码
-      code: formData.value.code,//规则代码
       name: formData.value.name,//名称
       description: formData.value.description,//描述
       priority: formData.value.priority,//优先级
@@ -369,7 +363,6 @@ const resetForm = () => {
   formData.value = {
     id: '',
     strategyCode: formStrategyCode.value,//策略代码
-    code: formStrategyCode.value,//规则代码
     name: '',//名称
     description: '',//描述
     priority: '',//优先级

src/views/wms/strategy/supplieDeliveryStrategy/index.vue

@@ -15,7 +15,6 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status?0:1" />
         </template>
       </el-table-column>
-      <!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180" :formatter="dateFormatter" /> -->
       <el-table-column align="center" label="操作" fixed="right" width="240">
         <template #default="scope">
           <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event, scope.row)" />

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

@@ -2,10 +2,10 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
     <div class="p-20px m--10px" style="max-height: 500px;overflow-y: auto;">
+      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
         <!-- 规则 -->
         <div class="item">
           <div class="title">规则</div>
-        <el-form ref="formRef1" :model="formData" :rules="rules" label-width="120px" label-position="left">
           <el-row>
             <el-col :span="24">
               <el-form-item label="代码" prop="code">
@@ -33,14 +33,16 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+
         <!-- 规则条件 -->
+
         <div class="item mt-20px">
+
           <div class="title">规则条件</div>
-        <el-form ref="formRef2" :model="formData" :rules="rules" label-width="120px" label-position="left">
-          <el-row>
           <!-- 选择供应商和客户 -->
+
+          <el-row>
             <el-col :span="24">
               <el-form-item label="" label-width="0" prop="supplier" class="err-240">
                 <el-select v-model="formData.type" placeholder="" style="width: 110px;margin-right: 10px;">
@@ -135,12 +137,12 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+
         <!-- 规则配置 -->
+
         <div class="item mt-20px">
           <div class="title">规则配置</div>
-        <el-form ref="formRef3" :model="formData" :rules="rules" label-width="120px" label-position="left">
           <el-row>
             <!-- 仓库 库区  库位组 库位 -->
             <el-col :span="24">
@@ -186,8 +188,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-        </el-form>
         </div>
+      </el-form>
     </div>
     <template #footer>
       <!-- 按钮-->