Merge branch 'master' of http://62.234.61.92:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

zkqy-ui/src/views/bussiness/components/TaskItem.vue

@@ -75,7 +75,7 @@ export default {
   flex: 1;
   box-sizing: border-box;
   background-color: #ebe6e6;
-  // margin-right: 15px;
+  /* // margin-right: 15px; */
   .task-title {
     font-size: 14px;
     font-weight: 600;

zkqy-ui/src/views/bussiness/components/taskList.vue

@@ -118,7 +118,7 @@ export default {
   }
   .card-list-wrap {
     margin: 5px 0 30px;
-    // height: 120px;
+    /* // height: 120px; */
     background: #fefefe;
     padding: 8px 5px;
     border-radius: 4px;
@@ -151,7 +151,7 @@ export default {
       height: 100%;
       overflow: hidden;
       display: flex;
-      // justify-content: space-around;\
+      /* // justify-content: space-around;\ */
       .card-item {
         margin-right: 15px;
         &:last-child {

zkqy-ui/src/views/bussiness/dialogCompments/GY2.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="form">
+        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">
+            <el-form-item label="产品重量" prop="weight">
+              <el-input v-model.number="ruleForm.weight" @input="handleInput"></el-input>
+            </el-form-item>
+            <el-form-item label="选择产品" prop="produce">
+              <el-select v-model="ruleForm.produce" placeholder="请选择产品">
+                <el-option label="产品1" value="chanpin1"></el-option>
+                <el-option label="产品2" value="chanpin2"></el-option>
+                <el-option label="产品3" value="chanpin3"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitForm('ruleForm')">提交</el-button>
+                <el-button @click="resetForm('ruleForm')">重置</el-button>
+              </el-form-item>
+        </el-form>
+
+    </div>
+</template>
+<script>
+export default {
+  name: "GY1",
+  props: [],
+  components: {},
+  data() {
+    return {
+        ruleForm: {
+            weight: '',
+            produce:''
+        },
+        rules: {
+            weight: [
+                { required: true, message: '请输入产品重量', trigger: 'blur' },
+                { type: 'number', message: '重量必须为数字值',trigger: 'blur' }
+            ],
+            produce: [
+                { required: true, message: '请选择产品', trigger: 'change' },
+            ]
+        }
+    }
+  },
+  methods:{
+    submitForm(formName) {
+        this.$refs[formName].validate((valid) => {
+          if (valid) {
+            alert('submit!');
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+      },
+      resetForm(formName) {
+        this.$refs[formName].resetFields();
+      },
+      handleInput() {
+        if (!/^[1-9]\d*$/.test(this.ruleForm.weight)) {
+            this.$message.error('请输入正整数！');
+        }
+      },
+      async getFormData() {
+        let formData = {
+          flag: false,
+          msg: "",
+        };
+        try {
+          let valid = await this.$refs.reluForm.validate();
+          if (valid) {
+            formData.flag = true;
+            formData.data = this.reluForm;
+            formData.msg = "表单校验成功";
+            return formData;
+          } else {
+            formData.msg = "表单校验异常,请规范填写表单数据";
+            return formData;
+          }
+        } catch (error) {
+          // console.log(error);
+          formData.msg = "表单校验异常,请规范填写表单数据";
+          return formData;
+        }
+      },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.form {
+  margin-top: 20px;
+  .el-input__inner {
+    width: 20px;
+  }
+}
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY02.vue

@@ -0,0 +1,203 @@
+<template>
+  <div class="add-table">
+    <div class="leftMessage">
+      <div class="list" v-for="(item, index) in baseMessage" :key="index">
+        <span class="titile" style="background:rgb(52,191,163); color:white;"> {{ item.title}} </span>
+        <span class="content" style="background:rgb(235,237,242); color:rgb(232,83,152);"> {{ item.content}} </span>
+      </div>
+      <div class="content"></div>
+    </div>
+    <div class="rightMessage">
+      <div class="top">       
+        <div class="state">
+          <div class="list">
+            <span>工序状态：</span>
+            <p>初始</p>
+          </div>
+          <div class="list">
+            <span>是否外协：</span>
+            <p>初始</p>
+          </div>
+        </div>    
+      </div>
+      <div class="button">
+        <el-button-group>
+          <el-button type="primary" icon="el-icon-video-play" plain round>开始</el-button>
+          <el-button type="danger" icon="el-icon-video-pause" plain>暂停</el-button> 
+          <el-button type="success" icon="el-icon-circle-check" plain>完成</el-button> 
+          <el-button type="info" icon="el-icon-refresh" plain round>重置</el-button>       
+ 
+        </el-button-group>
+
+      </div>
+      <div class="middle">
+        <el-table :data="tableData2" border >
+          <el-table-column>
+            
+          </el-table-column>
+        </el-table>
+        <div class="name">人员及工时分配</div>       
+        <el-table :data="tableData1" border ref="addTableRowRef">
+          <el-table-column label="人员姓名">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.name"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="分配工时">
+            <template slot-scope="scope">
+              <el-input-number v-model="scope.row.time" controls-position="right" @change="handleChange" :min="0.25" :max="8" :step="0.25"></el-input-number>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" width="120" align="center">
+            <template slot-scope="scope">
+              <el-button
+              icon="el-icon-delete"
+              size="mini"
+              @click="deleteTableRow(scope.row)"
+              >删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            layout="prev, pager, next"
+            :total="50">
+          </el-pagination>
+        </div>
+        <el-button size="mini" icon="el-icon-plus" type="primary" @click="addTableRow">新 增</el-button>
+        <el-button size="mini" icon="el-icon-check" type="success" @click="saveTableRow(newRow)">保 存</el-button>
+      </div>
+      <div class="footer">
+       <div class="total">
+        <span>当前工序总工时： 10</span>
+        <span>当前已分配工时： 10</span>
+        <span>当前剩余工时： 10</span>
+       </div>
+      </div>
+    </div>
+    
+  </div>
+</template>
+<script>
+export default {
+  name: 'GY02',
+  data() {
+    return {
+      tableData1: [],
+      tableData2: [],
+      newRow: {},
+      baseMessage: [
+        { title:'任务', content:'47as04-51-1238'},
+        { title:'图号', content:'1CG12-38'},
+        { title:'名称', content:'支架'},
+        { title:'数量', content:'1'},
+        { title:'工艺', content:'1'},
+        { title:'质控', content:'1'},
+      ]
+    }
+  },
+  methods: {
+    addTableRow() {
+      const newRow = {
+          name: '',
+          time: 0.25,
+      };  
+      this.tableData1.push(newRow);       
+    },
+    deleteTableRow(row) {
+      const index = this.tableData1.indexOf(row);
+      if (index !== -1) {
+        this.tableData1.splice(index, 1);
+      }
+    },
+    saveTableRow(tableData1) {
+      let item = '';
+      for(let i = 0; i < this.tableData1.length; i++) {
+        item += tableData1[i]
+      }
+      this.tableData2 = this.item;
+      this.tableData1 = [];
+    },
+    handleChange(value) {
+      console.log(value);
+    }
+
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.add-table {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  .leftMessage {
+    display: flex;
+    flex-direction: column;
+    width: 180px;
+    .list {
+      padding: 10px 0px ;
+      span {  
+        border-radius: 10px;
+        padding: 5px;
+        margin-right: 10px;
+      }
+    }
+    
+  }
+  .rightMessage {
+    display: flex;
+    width: 500px;
+    flex-direction: column;
+    .top {
+      background: #53B0F8;
+      color: white;
+      height: 60px;
+      .state {
+        display: flex;
+        flex-direction: row;
+        padding: 10px 20px;
+        span {
+          padding-right: 150px;
+        }
+        p {
+          padding-top: 5px;
+          font-size: 10px;
+        }
+      }
+    }
+    .button {
+      width: 100%;
+      padding: 20px 0px;
+      .el-button {
+        width: 140px;
+        background: none;
+
+      }
+      .el-button--info {
+        width: 80px;
+      }
+    }
+    .middle {
+      .name {
+        color: black;
+        font-weight: bold;
+        text-align: center;
+        padding: 10px 0px;
+      }
+      .block {
+        text-align: center;
+      }
+    }
+    .footer {
+      display: inline-block;
+      flex-direction: row;
+      margin-top: 10px;
+      span {
+        font-weight: bold;
+        color: black;
+      }
+    }
+  }
+}
+</style>

zkqy-ui/src/views/bussiness/dialogCompments/GongYi/GY06.vue

@@ -166,10 +166,10 @@ export default {
           margin-right: 5px;
         }
         .title {
-          // color: #ececee34;
+          /* // color: #ececee34; */
           font-size: 14px;
           flex: 1;
-          // ma
+          /* // ma */
         }
         .time {
           font-size: 12px;

zkqy-ui/src/views/bussiness/dialogCompments/ZhiLiang/ZL1.vue

@@ -0,0 +1,151 @@
+<template>
+    <div class="record-card">
+        <div class="fixture">
+            <div class="title">
+                <i class="el-icon-c-scale-to-original"></i>
+                <span>工装信息</span>
+            </div>
+            <div class="message">
+                <div class="list" v-for="(item,index ) in message" :key="index">
+                   <div class="list-card">
+                    <p> {{ item.title }}</p>
+                    <p class="content"> {{ item.content }} </p>
+                   </div>
+                </div>
+            </div>
+        </div>
+        <div class="material">
+            <div class="title">
+                <i class="el-icon-c-scale-to-original"></i>
+                <span>物料需求信息</span>
+            </div>
+            <div class="message">
+                <div class="list" v-for="(item,index ) in message" :key="index">
+                   <div class="list-card">
+                    <p> {{ item.title }}</p>
+                    <p class="content"> {{ item.content }} </p>
+                   </div>
+                </div>
+            </div>
+        </div>
+        <div class="card">
+            <div class="title"><span>质控卡号</span></div>
+            <el-input v-model="input" placeholder="请输入内容"></el-input>
+        </div>
+        <div class="submit">
+            <el-button type="success" icon="el-icon-success">记录质控卡</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'ZL1',
+
+    data() {
+        return {
+            message: [
+                {title: '任务编号', content: 'task_50'},
+                {title: '图号', content: 'drawinng_50'},
+                {title: '投产数量', content: '1'},
+                {title: '牌号', content: '1'},
+                {title: '状态', content: '1'},
+                {title: '标准', content: '1'},
+                {title: '物资名称', content: '1'},
+                {title: '材料/产品', content: '1'},
+                {title: '规格', content: '1'},
+                {title: '尺寸', content: '1'},
+                {title: '备注', content: '1'},
+            ],
+            input: '',
+        };
+    },
+
+    mounted() {
+        
+    },
+
+    methods: {
+        recordValue() {
+            this.$emit('ZL1', this.message[0].content);
+        }
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+.fixture {
+    border-top: #e2e1e1 solid 1px;
+    .title {
+        display: flex;
+        flex-direction: row;
+        padding: 10px 0px; 
+    }
+    .message {
+        display: flex;
+        /* height: 120px; */
+        width: 700px;
+        border: #f1f1f1 solid 3px;
+        padding-bottom: 5px;
+        flex-wrap: wrap;
+        .list {
+            height: 70px;
+            width: 110px;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            /* justify-content: center; */
+            flex-wrap: wrap;
+            p {
+                text-align: center;
+            }
+            .content {
+                font-weight: bold;
+            }
+        }
+    }
+}
+.material {
+    padding-top: 2px;
+    .title {
+        display: flex;
+        flex-direction: row;
+        padding: 10px 0px;
+    }
+    .message {
+        display: flex;
+        /* height: 120px; */
+        width: 700px;
+        border: #f1f1f1 solid 3px;
+        padding-bottom: 5px;
+        flex-wrap: wrap;
+        .list {
+            height: 70px;
+            width: 110px;
+            padding: 10px;
+            display: flex;
+            flex-direction: row;
+            /* justify-content: center; */
+            flex-wrap: wrap;
+            p {
+                text-align: center;
+            }
+            .content {
+                font-weight: bold;
+            }
+        }
+    }
+}
+.card {
+    .title {
+        padding: 10px 0px;
+    }
+}
+.submit {
+    display: flex;
+    flex-direction: row-reverse;
+    padding: 10px 0px;
+    border-bottom: #e2e1e1 solid 1px;
+
+}
+</style>

zkqy-ui/src/views/bussiness/processMange.vue

@@ -148,6 +148,7 @@
             </template>
           </el-table-column>
         </el-table>
+
         <!--    分页    -->
         <pagination
           v-show="total > 0"
@@ -157,6 +158,7 @@
           @pagination="getList"
         />
       </div>
+
       <div class="show-window">
         <!-- 运行节点弹窗 -->
 
@@ -164,7 +166,7 @@
           <!-- <el-form label-width="100px" :model="commonData">
             <h1>这里会引入当前节点需要处理的表单</h1>
           </el-form> -->
-          <k-form-build
+          <!-- <k-form-build
             v-if="formType == 'dragForm'"
             class="formBuild"
             ref="addFromRef"
@@ -211,6 +213,8 @@ import {
 import { triggerExceptionNode } from "@/api/bpmprocess/process";
 
 import getNodeSequence from "@/utils/bpmn/getNodeSequence";
+import GY02 from "./dialogCompments/GongYi/GY02.vue";
+import ZL1 from "./dialogCompments/ZhiLiang/ZL1.vue";
 import { getForm } from "@/api/dragform/form";
 import DialogTemplate from "@/views/dialogTemplate/components/index.vue";
 
@@ -225,7 +229,7 @@ import GY06 from "./dialogCompments/GongYi/GY06.vue";
 export default {
   name: "processMange",
   props: [],
-  components: { GY01, DialogTemplate, CG1, KC1, GY06, GY03, KC02 },
+  components: { GY01, DialogTemplate, CG1, KC1, GY06, GY03, KC02, GY02 },
   dicts: ["bpm_type", "task_process_state"],
   data() {
     return {
@@ -564,9 +568,9 @@ export default {
   .col {
     background-color: #fff;
     border-right: 1px solid #ebedf2;
-    // margin-right: 3px;
+    /* margin-right: 3px; */
     .statistic-wrap {
-      // height: 70px;
+      /* // height: 70px; */
       box-sizing: border-box;
       display: flex;
       align-items: center;
@@ -609,8 +613,8 @@ export default {
       padding: 0px 20px 0px 20px;
       height: 70px;
 
-      .header {
-      }
+      /* .header {
+      } */
 
       .search-list {
         display: flex;

zkqy-ui/vue.config.js

@@ -37,7 +37,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.83:8080`,
+        target: `http://192.168.110.59:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''