2022-12-14修改

ant-design-vue-jeecg/src/views/erp/accessories/ZyAccessoriesList.vue

@@ -177,7 +177,7 @@
           {
             title:'供货商信息',
             align:"center",
-            dataIndex: 'supplierInfo'
+            dataIndex: 'supplierInfo_dictText'
           },
           {
             title: '操作',

ant-design-vue-jeecg/src/views/erp/accessories/modules/ZyAccessoriesForm.vue

@@ -52,9 +52,14 @@
               <a-input-number v-model="model.store" placeholder="请输入库存量" style="width: 100%" />
             </a-form-model-item>
           </a-col>
+<!--          <a-col :span="24">-->
+<!--            <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">-->
+<!--              <a-input v-model="model.supplierInfo" placeholder="请输入供货商信息"  ></a-input>-->
+<!--            </a-form-model-item>-->
+<!--          </a-col>-->
           <a-col :span="24">
             <a-form-model-item label="供货商信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplierInfo">
-              <a-input v-model="model.supplierInfo" placeholder="请输入供货商信息"  ></a-input>
+              <j-select-depart  v-model="model.supplierInfo" placeholder="请输入供货商信息" />
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -104,6 +109,10 @@
           contents: [
             { required: true, message: '请输入名称!'},
           ],
+          store: [
+      {
+        pattern: /^\d*\.?\d+$/,message:'请输入正数'
+      }],
         },
         url: {
           add: "/accessories/zyAccessories/add",

ant-design-vue-jeecg/src/views/erp/fabric/modules/ZyFabricForm.vue

@@ -63,12 +63,12 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="零售价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="retailPrice">
+            <a-form-model-item label="零售价（元）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="retailPrice">
               <a-input-number v-model="model.retailPrice" placeholder="请输入零售价" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="单位" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
+            <a-form-model-item label="单位（元）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="unit">
               <j-dict-select-tag v-model="model.unit" type="radioButton" title="单位" dictCode="unit1" />
             </a-form-model-item>
           </a-col>
@@ -83,7 +83,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="幅宽" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothW">
+            <a-form-model-item label="幅宽（米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clothW">
               <j-search-select-tag v-model="model.clothW" dict="clothW"  />
             </a-form-model-item>
           </a-col>
@@ -189,6 +189,14 @@
           name: [
             { required: true, message: '请输入名称!'},
           ],
+          money: [
+            { required: true, message: '请输入单价!'},
+            {pattern: /^\d+$/,message:'请输入正整数'}
+          ],
+          retailPrice: [
+            { required: true, message: '请输入零售价!'},
+            {pattern: /^\d+$/,message:'请输入正整数'}
+          ],
           // money: [
           //   { required: false},
           //   { pattern: /^\d{0,11}$/, message: '长度不能超过11位数字'},

ant-design-vue-jeecg/src/views/process/modules/ZyClothActionForm.vue

@@ -75,12 +75,15 @@
         validatorRules: {
           freq: [
             { required: true, message: '请输入频率!'},
+            {pattern: /^\d+$/,message:'请输入正整数'}
           ],
           machineTmu: [
             { required: true, message: '请输入机器TMU!'},
+            {pattern: /^\d+$/,message:'请输入正整数'}
           ],
           manualTmu: [
             { required: true, message: '请输入手工TMU!'},
+            {pattern: /^\d+$/,message:'请输入正整数'}
           ],
           nums: [
             { required: true, message: '请输入编号!'},

ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue

@@ -157,6 +157,11 @@
                 align:"center",
                 dataIndex: 'nums'
             },
+          {
+            title:'顺序',
+            align:"center",
+            dataIndex: 'sortAction'
+          },
           {
             title:'动作',
             align:"center",
@@ -207,6 +212,7 @@
       up(id){
          getAction(this.url.up,{id:id}).then((res)=>{
              if(res.success){
+               this.loadData();
                this.$message.success(res.message);
              }else{
                this.$message.warning(res.message);
@@ -215,6 +221,7 @@
            down(id){
           getAction(this.url.down,{id:id}).then((res)=>{
               if(res.success){
+                this.loadData();
                 this.$message.success(res.message);
               }else{
                 this.$message.warning(res.message);

ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue

@@ -267,7 +267,9 @@
            fabricNum: [
               { required: true, message: '请输入面料代码!'},
            ],
-
+          price:[{
+             pattern: /^\d*\.?\d+$/,message:'请输入正数'
+           },],
           processCode: [
             { required: true, message: '请输入工序代码!'},
           ],

jeecg-boot/jeecg-boot-module-erp/src/main/java/org/jeecg/modules/demo/accessories/entity/ZyAccessories.java

@@ -67,6 +67,7 @@ public class ZyAccessories implements Serializable {
 	/**供货商信息*/
 	@Excel(name = "供货商信息", width = 15)
     @ApiModelProperty(value = "供货商信息")
+    @Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id")
     private java.lang.String supplierInfo;
 
     /**创建人*/

jeecg-boot/jeecg-boot-module-process/src/main/java/org/jeecg/modules/demo/pro/mapper/ZyProcessActionMapper.java

@@ -22,7 +22,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface ZyProcessActionMapper extends BaseMapper<ZyProcessAction> {
     @Select("<script>select * from zy_process_action <where><if test=\" p != null\">process_id in (select id from zy_process where process_name like #{p})</if><if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
     IPage<ZyProcessAction> page(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
-    @Select("<script>select a.*,b.process_code,c.nums from zy_process_action as a,zy_process as b,zy_cloth_action as c <where> a.process_id=b.id and a.action_id=c.id and a.process_id =#{p}<if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where></script>")
+    @Select("<script>select a.*,b.process_code,c.nums from zy_process_action as a,zy_process as b,zy_cloth_action as c <where> a.process_id=b.id and a.action_id=c.id and a.process_id =#{p}<if test=\" m != null\"> and action_id in (select id from zy_cloth_action where descr like #{m})</if></where> order by sort_action desc</script>")
     IPage<ZyProcessAction> page1(Page<ZyProcessAction> page, @Param("p") String s, @Param("m") String t);
     @Select("select * from zy_cloth_action where id in (select action_id from zy_process_action where process_id=#{id}) ")
     List<ZyClothAction> selectByid(String id);