Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

i18n/locale/zh-CN.js

@@ -1218,7 +1218,7 @@ export default {
     resourceType: '首选资源',
     resourceCode: '首选资源',
     runtime: '排产单件工时',
-    setupTime: '准备工时',
+    setupTime: '排产准结工时',
     transportTime: '转运工时',
     checkTime: '检验工时',
     checkFlag: '检验标识',
@@ -1235,7 +1235,7 @@ export default {
     outsideTime: '外协工期',
     performanceHours: '绩效工时',
     isImportantResources: '关重资源',
-    schedulingWorkingHours: '排产准结工时',
+    schedulingWorkingHours: '*排产准结工时',//准备工时？
     realWorkingHours: '实作准结工时',
     realRuntime: '实作单件工时',
     performanceWorkingHours: '绩效准结工时',

pages/produce/execute/ProcessCheck/components/api.js

+import Api from '@/plugins/request'
+export default {
+    index: `${crmUrl}/project/paged`,
+    paged(params) {
+        return Api.post(`${crmUrl}/project/paged`, params);
+    },
+    list(params) {
+        return Api.post(`${crmUrl}/customer/list`, params);
+    },
+    get(params) {
+        return Api.get(`${crmUrl}/project/get`, params);
+    },
+    create(params) {
+        return Api.post(`${crmUrl}/project/create`, params);
+    },
+    update(params) {
+        return Api.post(`${crmUrl}/project/update`, params);
+    },
+    //删除：
+    delete(params) {
+        return Api.delete(`${crmUrl}/project/delete`, { params: params });
+    },
+    getshoptree(params) { //获取组织树
+        return Api.get(`${crmUrl}/shop/getshoptree`, params);
+    },
+    customerconnectors(params) { //客户下所以联系人
+        return Api.get(`${crmUrl}/connector/customerconnectors`, params);
+    },
+}
\ No newline at end of file

pages/produce/execute/ProcessCheck/components/guidance.vue

@@ -2,33 +2,105 @@
 <template>
     <div class="">
         <div class="case_box">
-            <!-- <CheckboxGroup> -->
-             <!-- <Tooltip content="查看详情" placement="top"> -->
-                <a class="file_card div_card" @click="ditaile(item.name)"
-                    v-for="(item,index) in cardlist" :label="item.id" :key="index">
-                    <div class="file">
-                        <Icon type="ios-paper" v-if="item.id%3==0"/>
-                        <!-- <Icon type="ios-film" v-else/> -->
-                        <Icon type="md-film" v-else/>
+            <!-- <a class="file_card div_card" @click="ditaile(item.name)"
+                v-for="(item,index) in cardlist" :label="item.id" :key="index">
+                <div class="file">
+                    <Icon type="ios-paper" v-if="item.id%3==0"/> -->
+                    <!-- <Icon type="ios-film" v-else/> -->
+                    <!-- <Icon type="md-film" v-else/>
+                </div>
+                <div class="list">
+                    <ul>
+                        <li>{{item.name}}</li>
+                        <li>{{item.userName}}</li>
+                        <li>{{item.time}}</li>
+                    </ul>
+                </div>
+            </a> -->
+            工艺提醒列表
+             <DataGrid
+                :columns="columns"
+                ref="grid" style="height:auto"
+                :action="action"
+                type="card"
+                :high="false"
+                :span="6"
+                :lazy="true"
+            >
+            <!-- <template slot="easySearch">
+                <Form ref="formInline" :model="easySearch" inline>
+                    <FormItem prop="keys">
+                    <Input
+                        search
+                        enter-button
+                        placeholder="请输入关键字项目名称"
+                        v-model="easySearch.keys.value"
+                        @on-search="search"
+                    />
+                    </FormItem>
+                </Form>
+            </template> -->
+            <template slot="buttons">
+                <Button type="primary" @click="add">新增</Button>
+            </template>
+                <!--<template slot="card" slot-scope="{row}">
+                    <!-- v-for="(item,index) in cardlist" :label="item.id" :key="index" 
+                <div class="body">
+                    <Row class="title-i">
+                    <Col :span="18" class="order-code">项目名称：{{row.name}}</Col>
+                    <Col :span="6" class="btn-click">
+                        <a @click="edit(row.id)">
+                        <Icon type="ios-create" @click="edit(row.id)" />
+                        </a>
+                        <a @click="detail(row.id)">
+                        <Icon type="ios-paper" />
+                        </a>
+                        <a @click="remove(row.id)">
+                        <Icon type="ios-trash" />
+                        </a>
+                    </Col>
+                    </Row>
+                    <div class="down-text">
+                    <Row class="row">
+                        <Col span="12" class="fa">主管部门:{{row.shopId}}</Col>
+                        <Col span="12" class="fa">负责人：{{row.principal}}</Col>
+                    </Row>
+                    <Row class="row">
+                        <Col span="12" class="fa">
+                        销售阶段：
+                        <state code="crm.project.stage" :value="row.stage" />
+                        </Col>
+                        <Col span="12" class="fa">
+                        是否报备：
+                        <state code="crm.project.isInform" :value="row.isInform" />
+                        </Col>
+                    </Row>
+                    <Row class="row">
+                        <Col span="12" class="fa">
+                        状态：
+                        <state code="crm.project.status" :value="row.status" />
+                        </Col>
+                        <Col span="12" class="fa">预算：{{row.budget}}</Col>
+                    </Row>
                     </div>
-                    <div class="list">
-                        <ul>
-                            <li>{{item.name}}</li>
-                            <li>{{item.userName}}</li>
-                            <li>{{item.time}}</li>
-                        </ul>
-                    </div>
-                </a>
-            <!-- </Tooltip> -->
-            <!-- </CheckboxGroup> -->
+                </div>
+                </template> -->
+            </DataGrid>
         </div> 
     </div>
 </template>
 <script>
+import Api from "./api";
 export default {
     name:'starOrder',
     data(){
         return{
+            action: Api.index,
+            easySearch: {
+                keys: { op: "name", value: null },
+                customerId: { op: "Equal", value: null }
+            },
+            columns: [{ key: "id", title: this.l("id"), hide: true, align: "left" }],
             cardlist:[
                 {
                     name:'工艺文档名称',
@@ -190,6 +262,9 @@ export default {
         ditaile(name){
             this.$Message.success("查看: "+ name +" 详情...")
         },
+        search() {
+            this.$refs.grid.reload(this.easySearch);
+        },
     },
 }
 </script>

pages/produce/execute/execute.less

@@ -39,8 +39,15 @@
                         font-size: 40px;
                     }
                 }
+                .icon_A{
+                    i{
+                        font-size: 40px;
+                        color: #2d8cf0;
+                    }
+                }
                 ul,li{
-                    list-style: disc;
+                    // list-style: disc;
+                    padding-left: 9PX;
                 }
             }
         }
@@ -340,9 +347,12 @@
         height: 50px;
     }
     .tech_body{
+        text-align: center;
+        background: #fff;
         .ivu-menu-horizontal{
             height: 50px;
             line-height: 50px;
+            display: inline-block;
             .ivu-menu-item{
                 width: 115px;
                 text-align: center;

pages/produce/execute/starOrder/index.vue

@@ -15,7 +15,10 @@
             </div>
             <div class="star_step">
                 <div class="step_item"  v-for="i of 6" :key="i">
-                    <p class="icon_B">
+                    <p class="icon_A" v-if="i>=4">
+                        <Icon type="md-checkmark-circle" />
+                    </p>
+                    <p class="icon_B" v-else>
                         <Icon type="md-arrow-dropright-circle" />
                     </p>
                     <p><a> 开工</a></p>

pages/technology/add.vue

@@ -47,7 +47,7 @@
       </Col>
       <Col :span="8">
         <FormItem :label="l('version')" prop="versionid">
-           <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
+          <Dictionary code="Process.Routing.version" v-model="entity.versionid"></Dictionary>
         </FormItem>
       </Col>
       <Col :span="8">
@@ -196,7 +196,15 @@ export default {
       },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
-        code: [{ required: true, message: "必填", trigger: "blur" }]
+        code: [{ required: true, message: "必填", trigger: "blur" }],
+        routingType: [
+          {
+            required: true,
+            message: "请选择工艺类型",
+            trigger: "change",
+            type: "number"
+          }
+        ]
       },
       parms: {
         app: "technology",

pages/technology/details/add.vue

@@ -109,8 +109,8 @@
           </FormItem>
         </Col>-->
         <Col :span="12">
-          <FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
-            <InputTime v-model="entity.schedulingWorkingHours" />
+          <FormItem :label="l('setupTime')" prop="setupTime">
+            <InputTime v-model="entity.setupTime" />
           </FormItem>
         </Col>
         <Col :span="12">
@@ -192,7 +192,7 @@ export default {
         isImportant: null,
         outsideTime: 0,
         isImportantResources: null,
-        schedulingWorkingHours: 0,
+        setupTime: 0,
         realWorkingHours: 0,
         realRuntime: 0,
         isParticipateIntime: null,

pages/technology/details/detail.vue

@@ -14,7 +14,7 @@
       <!-- <Filed :span="12" :name="l('isImportantResources')">
         <state code="Process.state" :value="entity.isImportantResources" type="text"></state>
       </Filed> -->
-      <Filed :span="12" :name="l('schedulingWorkingHours')"><OutputTime :value="entity.schedulingWorkingHours"></OutputTime></Filed>
+      <Filed :span="12" :name="l('setupTime')"><OutputTime :value="entity.setupTime"></OutputTime></Filed>
       <Filed :span="12" :name="l('runtime')"><OutputTime :value="entity.runtime"></OutputTime></Filed>
       <Filed :span="12" :name="l('realRuntime')"><OutputTime :value="entity.realRuntime"></OutputTime></Filed>
       <Filed :span="12" :name="l('realWorkingHours')"><OutputTime :value="entity.realWorkingHours"></OutputTime></Filed>

pages/technology/details/edit.vue

@@ -109,8 +109,8 @@
           </FormItem>
         </Col>-->
         <Col :span="12">
-          <FormItem :label="l('schedulingWorkingHours')" prop="schedulingWorkingHours">
-            <InputTime v-model="entity.schedulingWorkingHours" />
+          <FormItem :label="l('setupTime')" prop="setupTime">
+            <InputTime v-model="entity.setupTime" />
           </FormItem>
         </Col>
         <Col :span="12">

pages/technology/details/index.vue

@@ -105,8 +105,8 @@ export default {
         // },
 
         {
-          key: "schedulingWorkingHours",
-          title: this.l("schedulingWorkingHours"),
+          key: "setupTime",
+          title: this.l("setupTime"),
           align: "right",
           type: "outputTime",
         },

pages/technology/details/routinghcorder/add.vue

@@ -127,7 +127,7 @@
         </Col>
       </Row>
     </Form>
-    <changeSendReview ref="changeSendReview"></changeSendReview>
+    <changeSendReview ref="changeSendReview"  @on-ok="ok"></changeSendReview>
   </div>
 </template>
     <script>
@@ -204,9 +204,7 @@ export default {
           this.disabled = true;
           this.entity.handlingOpinions = this.entity.handlingOpinionsId;
           this.entity.routingHeaderId = this.headid;
-          if (!this.checked) {
-            this.entity.status = 1;
-          }
+          this.entity.status = 1;
           Api.create(this.entity)
             .then(r => {
               this.disabled = false;
@@ -293,6 +291,10 @@ export default {
       this.entity.departmentId = v;
       this.entity.departmentName = items.name;
     },
+    ok()
+    {
+      this.$emit("on-ok")
+    },
     l(key) {
       key = "routing_header_changeorder" + "." + key;
       return this.$t(key);

pages/technology/details/routinghcorder/changeSendReview.vue

@@ -87,6 +87,7 @@ export default {
         this.$http.order.batchstart(this.dataListRetrunNew).then(response => {
           if (response.success) {
             this.$Message.info("工艺更改单送审成功!");
+            this.$emit("on-ok")
           } else {
             this.$Message.error("送审失败!");
           }

pages/technology/details/routinghcorder/index.vue

@@ -21,15 +21,18 @@
     <Modal v-model="modal" :title="title" width="1200" footer-hide scrollable>
       <component :is="detail" :eid="curId" :headid="hid" @on-close="cancel" @on-ok="ok" />
     </Modal>
+    <changeSendReview ref="changeSendReview" @on-ok="ok"></changeSendReview>
   </div>
 </template>
 <script>
 import Api from "./api";
 import Search from "./search";
+import changeSendReview from "./changeSendReview.vue";
 export default {
   name: "list",
   components: {
-    Search
+    Search,
+    changeSendReview
   },
   head: {
     title: "工艺变更单",
@@ -122,7 +125,7 @@ export default {
           key: "creationTime",
           title: this.l("creationTime"),
           hide: true,
-          align: "left",
+          align: "center",
           hide: true
         },
         {
@@ -137,7 +140,7 @@ export default {
           key: "lastModificationTime",
           title: this.l("lastModificationTime"),
           hide: true,
-          align: "left",
+          align: "center",
           hide: true
         },
         {
@@ -151,7 +154,7 @@ export default {
         {
           title: "操作",
           key: "action",
-          width: 120,
+          width: 150,
           align: "left",
           render: (h, params) => {
             return h("div", { class: "action" }, [
@@ -170,7 +173,7 @@ export default {
                   attrs: { oprate: "edit" },
                   on: { click: () => this.edit(params.row.id) }
                 },
-                params.row.status == 1 ? "编辑" : ""
+                params.row.status == 1||params.row.status == 4 ? "编辑" : ""
               ),
               h(
                 "op",
@@ -178,7 +181,15 @@ export default {
                   attrs: { oprate: "delete" },
                   on: { click: () => this.remove(params.row.id) }
                 },
-                params.row.status == 1 ? "删除" : ""
+                params.row.status == 1||params.row.status == 4 ? "删除" : ""
+              ),
+              h(
+                "op",
+                {
+                  attrs: { oprate: "edit" },
+                  on: { click: () => this.sendReview(params.row) }
+                },
+                params.row.status == null||params.row.status == 1 ? "送审" : ""
               )
             ]);
           }
@@ -188,7 +199,7 @@ export default {
   },
   mounted() {
     console.log(this);
-    this.search()
+    this.search();
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
@@ -196,6 +207,7 @@ export default {
   methods: {
     ok() {
       this.$refs.grid.load();
+      this.$refs.changeSendReview.modalInfo = false;
       this.modal = false;
       this.curId = 0;
     },
@@ -239,6 +251,18 @@ export default {
       this.curId = 0;
       this.modal = false;
     },
+    sendReview(row) {
+      let params = {
+        changeorder_code: row.changeorderCode,
+        pageindex: 1,
+        pageSize: 10
+      };
+      Api.getpaged1(params).then(res => {
+        this.$refs.changeSendReview.info.changeInfo = res.result.items[0];
+        this.$refs.changeSendReview.changeorder_code = row.changeorderCode;
+      });
+      this.$refs.changeSendReview.modalInfo = true;
+    },
     l(key) {
       let vkey = "routing_header_changeorder" + "." + key;
       return this.$t(vkey) || key;

pages/technology/index.vue

@@ -275,7 +275,7 @@ export default {
         {
           title: "操作",
           key: "action",
-          width: 320,
+          width: 260,
           align: "left",
           render: (h, params) => {
             return h("div", { class: "action" }, [