2023-1-16工序详情

2 years ago · 286f167126
parent da123bbd70
commit 286f167126
8 changed files with 74 additions and 26 deletions
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessAccessoriesList.vue
@ -79,9 +79,9 @@
        </template>

        <span slot="action" slot-scope="text, record">
-<!--          <a @click="handleEdit1(record,code)">编辑</a>-->
+     <a @click="handleDetail(record.accessoriesId)">详情</a>

-<!--          <a-divider type="vertical" />-->
+          <a-divider type="vertical" />


 <!--                <a @click="handleDetail(record)">详情</a>-->
@ -94,7 +94,7 @@

      </a-table>
    </div>
-
+    <ZyAccessoriesFormDetail ref="ZyAccessoriesFormDetail"></ZyAccessoriesFormDetail>
    <zy-process-accessories-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-accessories-modal>
  </a-card>
 </template>
@ -105,12 +105,13 @@
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ZyProcessAccessoriesModal from './ZyProcessAccessoriesModal'
-
+  import ZyAccessoriesFormDetail from '@/views/erp/accessories/modules/ZyAccessoriesFormDetail'
  export default {
    name: 'ZyProcessAccessoriesList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
-      ZyProcessAccessoriesModal
+      ZyProcessAccessoriesModal,
+      ZyAccessoriesFormDetail
    },
    data () {
      return {
@ -205,6 +206,9 @@
        fieldList.push({type:'popup',value:'processId',text:'工序表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
        fieldList.push({type:'popup',value:'accessoriesId',text:'辅料表id', popup:{code:'',field:'',orgFields:'',destFields:''}})
        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyAccessoriesFormDetail.showModal(id)
      }
    }
  }
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessActionList.vue
@ -80,8 +80,8 @@

        <span slot="action" slot-scope="text, record">

-
-<!--          <a-divider type="vertical" />-->
+ <a @click="handleDetail(record.actionId)">详情</a>
+          <a-divider type="vertical" />

 <!--                <a @click="handleDetail(record)">详情</a>-->
 <!--          <a-divider type="vertical" />-->
@ -98,6 +98,7 @@
    </div>

    <zy-process-action-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-action-modal>
+    <ZyClothActionFormDetail ref="ZyClothActionFormDetail"></ZyClothActionFormDetail>
  </a-card>
 </template>

@ -107,6 +108,7 @@
  import { mixinDevice } from '@/utils/mixin'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ZyProcessActionModal from './ZyProcessActionModal'
+  import ZyClothActionFormDetail from './ZyClothActionFormDetail'
  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
  import {getAction} from "@api/manage";

@ -114,7 +116,8 @@
    name: 'ZyProcessActionList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
-      ZyProcessActionModal
+      ZyProcessActionModal,
+      ZyClothActionFormDetail
    },
    data () {
      return {
@ -237,6 +240,9 @@
        fieldList.push({type:'string',value:'processId',text:'工序id',dictCode:'zy_process,process_name,id'})
        fieldList.push({type:'string',value:'actionId',text:'动作id',dictCode:'zy_cloth_action,descr,nums'})
        this.superFieldList = fieldList
+      },
+      handleDetail(id){
+        this.$refs.ZyClothActionFormDetail.showModal(id)
      }
    }
  }
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessFabricList.vue
@ -85,8 +85,9 @@

        <span slot="action" slot-scope="text, record">
 <!--          <a @click="handleEdit1(record,code)">编辑</a>-->
+ <a @click="handleDetail(record.fabricId,record.fabricId_dictText)">详情</a>

-<!--           <a-divider type="vertical" />-->
+           <a-divider type="vertical" />

 <!--                <a @click="handleDetail(record)">详情</a>-->
 <!--                      <a-divider type="vertical" />-->
@ -100,6 +101,7 @@
    </div>

    <zy-process-fabric-modal  @valueChange="valueChange" ref="modalForm" @ok="modalFormOk"></zy-process-fabric-modal>
+    <ZyFabricFormDetailModel ref="ZyFabricFormDetailModel"></ZyFabricFormDetailModel>
  </a-card>
 </template>

@ -110,12 +112,14 @@
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import ZyProcessFabricModal from './ZyProcessFabricModal'
  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+  import  ZyFabricFormDetailModel from  '@/views/erp/fabric/modules/ZyFabricFormDetailModel'

  export default {
    name: 'ZyProcessFabricList',
    mixins:[JeecgListMixin, mixinDevice],
    components: {
-      ZyProcessFabricModal
+      ZyProcessFabricModal,
+      ZyFabricFormDetailModel
    },
    data () {
      return {
@ -209,6 +213,10 @@
        fieldList.push({type:'string',value:'processId',text:'工序',dictCode:'zy_process,process_name,id'})
        fieldList.push({type:'string',value:'fabricId',text:'面料',dictCode:'zy_fabric,name,id'})
        this.superFieldList = fieldList
+      },
+      handleDetail(id,name){
+        this.$refs.ZyFabricFormDetailModel.showModal(id,name)
+        // this.$children[0].showModal(id)
      }
    }
  }
--- a/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
+++ b/ant-design-vue-jeecg/src/views/process/modules/ZyProcessForm.vue
@ -42,7 +42,7 @@
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工序时间（秒）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processTime">
-              <a-input-number v-model="model.processTime" placeholder="请输入工序时间"  ></a-input-number>
+              <a-input v-model="model.processTime" placeholder="请输入工序时间"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="11">
@ -78,12 +78,12 @@
 <!--          </a-col>-->
          <a-col :span="12">
            <a-form-model-item label="手工宽放（毫米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manualWide">
-              <a-input-number v-model="model.manualWide" placeholder="请输入手工宽放"  ></a-input-number>
+              <a-input v-model="model.manualWide" placeholder="请输入手工宽放"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="11">
            <a-form-model-item label="手工时间（秒）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manualTime">
-              <a-input-number v-model="model.manualTime" placeholder="请输入手工时间" style="width: 100%" />
+              <a-input v-model="model.manualTime" placeholder="请输入手工时间" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@ -93,7 +93,7 @@
          </a-col>
          <a-col :span="11">
            <a-form-model-item label="机器宽放（毫米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machineWide">
-              <a-input-number v-model="model.machineWide" placeholder="请输入机器宽放"  ></a-input-number>
+              <a-input v-model="model.machineWide" placeholder="请输入机器宽放"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@ -108,7 +108,7 @@
 <!--          </a-col>-->
          <a-col :span="11">
            <a-form-model-item label="绑包宽放（毫米）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bundleWide">
-              <a-input-number v-model="model.bundleWide" placeholder="请输入绑包宽放"  ></a-input-number>
+              <a-input v-model="model.bundleWide" placeholder="请输入绑包宽放"  ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
@ -265,9 +265,35 @@
        },
        confirmLoading: false,
        validatorRules: {
+          processTime:[
+            {
+              pattern: /^\d+$/,message:'请输入正整数'
+            },
+          ],
+          manualWide:[
+            {
+              pattern: /^\d+$/,message:'请输入正整数'
+            },
+          ],
+          machineWide:[
+            {
+              pattern: /^\d+$/,message:'请输入正整数'
+            },
+          ],
+          bundleWide:[
+            {
+              pattern: /^\d+$/,message:'请输入正整数'
+            },
+          ],
           fabricNum: [
              { required: true, message: '请输入面料代码!'},
           ],
+          enterpriseId: [
+            { required: true, message: '请选择企业!'},
+          ],
+          typeId: [
+            { required: true, message: '请选择款式!'},
+          ],
          price:[{
             pattern: /^\d*\.?\d+$/,message:'请输入正数'
           },],
--- a/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdaccessories/ProductAccessoriesList.vue
@ -1,6 +1,6 @@
 <template>
  <a-card :bordered="false">
-    <p style="font-size: 30px;color:#333">{{biaoTi}}</p>
+    <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -178,6 +178,7 @@
        },
        dictOptions:{},
        superFieldList:[],
+        loadRouteType:false,
      }
    },
    created() {
@ -209,7 +210,7 @@
      loadParameter() {
        if (this.loadRouteType === false) {
          this.id = this.$route.query.id;
-          this.biaoTi = this.$route.query.styleNames+"产品辅料管理";
+          this.biaoTi = this.$route.query.productName+"产品辅料管理";
          console.log("***********")
          this.loadRouteType = true;
        }
--- a/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdfabric/ProductFabricList.vue
@ -1,6 +1,6 @@
 <template>
  <a-card :bordered="false">
-    <p style="font-size: 30px;color:#333">{{biaoTi}}</p>
+    <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -172,6 +172,7 @@
        },
        dictOptions:{},
        superFieldList:[],
+        loadRouteType:false,
      }
    },
    created() {
@ -203,8 +204,8 @@
      loadParameter() {
        if (this.loadRouteType === false) {
          this.id = this.$route.query.id;
-          this.biaoTi = this.$route.query.styleNames+"产品面料管理";
-          console.log("***********")
+          this.biaoTi = this.$route.query.productName+"产品面料管理";
+          console.log("***********想看看")
          this.loadRouteType = true;
        }
      },
--- a/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdmachine/ProductMachineList.vue
@ -1,6 +1,6 @@
 <template>
  <a-card :bordered="false">
-    <p style="font-size: 30px;color:#333">{{biaoTi}}</p>
+    <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
@ -174,6 +174,7 @@
        },
        dictOptions:{},
        superFieldList:[],
+        loadRouteType:false
      }
    },
    created() {
@ -222,7 +223,7 @@
      loadParameter() {
        if (this.loadRouteType === false) {
          this.id = this.$route.query.id;
-          this.biaoTi = this.$route.query.styleNames+"产品设备管理";
+          this.biaoTi = this.$route.query.productName+"产品设备管理";
          console.log("***********")
          this.loadRouteType = true;
        }
--- a/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue
+++ b/ant-design-vue-jeecg/src/views/product/pdoperationtool/ProductOperationtoolList.vue
@ -1,13 +1,13 @@
 <template>
  <a-card :bordered="false">
-    <p style="font-size: 30px;color:#333">{{biaoTi}}</p>
+    <p style="font-size: 30px;color:#333;padding-left: 40%">{{biaoTi}}</p>
    <!-- 查询区域 -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="设备名称">
-              <a-input placeholder="设备名称" v-model="operationtoolId"></a-input>
+            <a-form-item label="工具名称">
+              <a-input placeholder="工具名称" v-model="operationtoolId"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -174,6 +174,7 @@
        },
        dictOptions:{},
        superFieldList:[],
+        loadRouteType:false,
      }
    },
    created() {
@ -222,7 +223,7 @@
      loadParameter() {
        if (this.loadRouteType === false) {
          this.id = this.$route.query.id;
-          this.biaoTi = this.$route.query.styleNames+"产品工具管理";
+          this.biaoTi = this.$route.query.productName+"产品工具管理";
          console.log("***********")
          this.loadRouteType = true;
        }