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

ee4bd9b2 · 仇晓婷 · 7f4784df · 27770b8e · ee4bd9b2 · ee4bd9b2
Commit ee4bd9b2 authored Sep 21, 2020 by 仇晓婷
7 changed files
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4938,7 +4938,7 @@
      "dependencies": {
        "commander": {
          "version": "2.14.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.14.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.14.1.tgz",
+          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.14.1.tgz",
          "integrity": "sha1-IjUSPjevjKPGXfRbAm29NXsBuao="
        }
      }
@@ -5467,7 +5467,7 @@
    },
    "crc-32": {
      "version": "1.2.0",
-      "resolved": "https://registry.npm.taobao.org/crc-32/download/crc-32-1.2.0.tgz",
+      "resolved": "http://r.cnpmjs.org/crc-32/download/crc-32-1.2.0.tgz",
      "integrity": "sha1-yy224puIUI4y2d0OwWk+e0Ghggg=",
      "requires": {
        "exit-on-epipe": "~1.0.1",
@@ -6338,11 +6338,11 @@
      }
    },
    "echarts": {
-      "version": "4.8.0",
+      "version": "4.9.0",
-      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.8.0.tgz",
+      "resolved": "https://registry.npm.taobao.org/echarts/download/echarts-4.9.0.tgz?cache=0&sync_timestamp=1598587691066&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fecharts%2Fdownload%2Fecharts-4.9.0.tgz",
-      "integrity": "sha1-ssHPuSKbE9No7hBPyO6mALV01MQ=",
+      "integrity": "sha1-qbm6oD8Doqcx5jQMVb77V6nhNH0=",
      "requires": {
-        "zrender": "4.3.1"
+        "zrender": "4.3.2"
      }
    },
    "echarts-liquidfill": {
@@ -7364,7 +7364,7 @@
    },
    "exit-on-epipe": {
      "version": "1.0.1",
-      "resolved": "https://registry.npm.taobao.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
+      "resolved": "http://r.cnpmjs.org/exit-on-epipe/download/exit-on-epipe-1.0.1.tgz",
      "integrity": "sha1-C92S6H1ShdJn2qgXHQ6wYVlolpI="
    },
    "expand-brackets": {
@@ -8015,7 +8015,7 @@
    },
    "frac": {
      "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/frac/download/frac-1.1.2.tgz",
+      "resolved": "http://r.cnpmjs.org/frac/download/frac-1.1.2.tgz",
      "integrity": "sha1-PXT39keMiKG1AgMG10fcYxPHTQs="
    },
    "fragment-cache": {
@@ -15087,7 +15087,7 @@
    },
    "printj": {
      "version": "1.1.2",
-      "resolved": "https://registry.npm.taobao.org/printj/download/printj-1.1.2.tgz",
+      "resolved": "http://r.cnpmjs.org/printj/download/printj-1.1.2.tgz",
      "integrity": "sha1-2Q3rKXWoufYA+zoclOP0xTx4oiI="
    },
    "private": {
@@ -20540,7 +20540,7 @@
    },
    "script-loader": {
      "version": "0.7.2",
-      "resolved": "https://registry.npm.taobao.org/script-loader/download/script-loader-0.7.2.tgz",
+      "resolved": "http://r.cnpmjs.org/script-loader/download/script-loader-0.7.2.tgz",
      "integrity": "sha1-IBbbb4byX1z1baOJFdgzeLsWa6c=",
      "dev": true,
      "requires": {
@@ -21128,7 +21128,7 @@
    },
    "ssf": {
      "version": "0.10.3",
-      "resolved": "https://registry.npm.taobao.org/ssf/download/ssf-0.10.3.tgz",
+      "resolved": "http://r.cnpmjs.org/ssf/download/ssf-0.10.3.tgz",
      "integrity": "sha1-jq4fwpyQpVLnkhII+BiS1vd6yys=",
      "requires": {
        "frac": "~1.1.2"
@@ -23778,7 +23778,7 @@
    },
    "wmf": {
      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/wmf/download/wmf-1.0.2.tgz",
+      "resolved": "http://r.cnpmjs.org/wmf/download/wmf-1.0.2.tgz",
      "integrity": "sha1-fRnWIQcaCMK9xrfmiKnENSmMwto="
    },
    "word-wrap": {
@@ -23933,7 +23933,7 @@
    },
    "xlsx": {
      "version": "0.15.6",
-      "resolved": "https://registry.npm.taobao.org/xlsx/download/xlsx-0.15.6.tgz?cache=0&sync_timestamp=1597272342311&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fxlsx%2Fdownload%2Fxlsx-0.15.6.tgz",
+      "resolved": "http://r.cnpmjs.org/xlsx/download/xlsx-0.15.6.tgz",
      "integrity": "sha1-Rh+EHW2eoag3XizSRr8jrs4IodU=",
      "requires": {
        "adler-32": "~1.2.0",
@@ -23948,7 +23948,7 @@
      "dependencies": {
        "commander": {
          "version": "2.17.1",
-          "resolved": "https://registry.npm.taobao.org/commander/download/commander-2.17.1.tgz?cache=0&sync_timestamp=1595168224685&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcommander%2Fdownload%2Fcommander-2.17.1.tgz",
+          "resolved": "http://r.cnpmjs.org/commander/download/commander-2.17.1.tgz",
          "integrity": "sha1-vXerfebelCBc6sxy8XFtKfIKd78="
        }
      }
@@ -24117,9 +24117,9 @@
      }
    },
    "zrender": {
-      "version": "4.3.1",
+      "version": "4.3.2",
-      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.1.tgz?cache=0&sync_timestamp=1597683748542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.1.tgz",
+      "resolved": "https://registry.npm.taobao.org/zrender/download/zrender-4.3.2.tgz?cache=0&sync_timestamp=1597683748542&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fzrender%2Fdownload%2Fzrender-4.3.2.tgz",
-      "integrity": "sha1-uviqbcgYei+BlpLX1fm+36K5D6M="
+      "integrity": "sha1-7HQy+UFcgsc1hLa3uMR+GwFiCcY="
    }
  }
 }
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
    "better-scroll": "^1.12.1",
    "cross-env": "^5.2.0",
    "dayjs": "^1.8.27",
-    "echarts": "^4.8.0",
+    "echarts": "^4.9.0",
    "echarts-liquidfill": "^2.0.5",
    "file-saver": "^2.0.2",
    "gantt-elastic": "^1.0.11",

--- a/pages/basicData/userManagent/api.js
+++ b/pages/basicData/userManagent/api.js
@@ -36,7 +36,7 @@ export default {
    },
    //10010修改密码
    authChangepassword(params) {
-        return Api.post(`${authUrl}/api/services/app/useraccount/changepassword`, params);
+        return Api.post(`${UserUrl}/api/services/app/account/changepassword`, params);
    },
    //在10020上更新用户AccountId信息
    updateAccount(params) {

--- a/pages/mesPlan/index.vue
+++ b/pages/mesPlan/index.vue
@@ -24,7 +24,7 @@
    </div>
    <Content class="content" :class="!showMenu?'con_bord':''">
        <!--:data="dataT"-->
-        <DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id" exportTitle="订单管理" @on-import-data="onImportData">
+        <DataGrid :action="action" :columns="columns" :conditions="easySearch" ref="grid" @on-selection-change="onSelect" :batch="true" :border="false" rowKey="id">
            <template slot="easySearch">
                <Form ref="formInline" :model="easySearch" inline>
                    <FormItem prop="keys">
@@ -376,7 +376,7 @@ export default {
                            h(
                                "op", {
                                    attrs: {
-                                        oprate: "remove"
+                                        // oprate: "delete"
                                    },
                                    on: {
                                        click: () => this.remove(params.row)
@@ -389,14 +389,14 @@ export default {
                                            params.row.id != params.row.rootId ||
                                            params.row.status != 1 ?
                                            "display:none" :
-                                            "") : (
+                                            "color:red") : (
                                            (params.row.status == 3 &&
                                                params.row.id == params.row.rootId &&
                                                params.row.divideMark != 0) ||
                                            params.row.id != params.row.rootId ||
                                            params.row.status != 3 ?
                                            "display:none" :
-                                            "")
+                                            "color:red")
                                },
                                "删除"
                            ),
@@ -770,7 +770,7 @@ export default {
            this.delMsg = "";
            this.delNum = 0;
            this.actIds = [];
-            this.$refs.grid.cancelFooterToolbar();
+            //this.$refs.grid.cancelFooterToolbar();
            this.actIds.push(row.id);
            if (row.id != row.rootId) {
                this.sondeletecheck(row.rootId);

--- a/pages/order/quotation/index.vue
+++ b/pages/order/quotation/index.vue
 <template>
-  <Layout class="quotation">
+<Layout class="quotation">
    <!-- 左侧树 -->
    <!-- <Sider hide-trigger :style="{background: '#fff'}" width="260">
      <Tree-Type @func="getMsgFormSon" :style="{ height: treeHeight + 'px' }"></Tree-Type>
@@ -19,14 +19,7 @@
                <div class="search-form">
                    <Row>
                        <Col span="12" style="display: flex;">
-                <Input
+                        <Input search v-model="mesCode" enter-button placeholder="订单编号、产品编码..." @on-search="easySearch(mesCode)" style="width:235px;flaot:left;" />
-                  search
-                  v-model="mesCode"
-                  enter-button
-                  placeholder="订单编号、产品编码..."
-                  @on-search="easySearch(mesCode)"
-                  style="width:235px;flaot:left;"
-                />
                        <Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button>
                        </Col>
                        <Col span="12" style=" text-align: right;">
@@ -38,52 +31,17 @@
                    </Row>
                </div>
                <div style="margin-top:10px;">
-            <Table
+                    <Table border highlight-row ref="selection" :columns="newColumn" :data="dataTable" :loading="loading" :height="tableHeight" class="tableCommon" @on-selection-change="selectInfo"></Table>
-              border
-              highlight-row
-              ref="selection"
-              :columns="newColumn"
-              :data="dataTable"
-              :loading="loading"
-              :height="tableHeight"
-              class="tableCommon"
-              @on-selection-change="selectInfo"
-            ></Table>
                </div>
            </TabPane>
            <TabPane label="报价记录" key="record" name="record">
-          <Input
+                <Input search enter-button placeholder="订单编号、报价单编号..." v-model="mesCodeT" @on-search="jlSearch(mesCodeT)" style="width:235px;flaot:left;" />
-            search
-            enter-button
-            placeholder="订单编号、报价单编号..."
-            v-model="mesCodeT"
-            @on-search="jlSearch(mesCodeT)"
-            style="width:235px;flaot:left;"
-          />
                <div style="margin-top:10px;">
-            <Table
+                    <Table border ref="selection" :columns="recordColumn" :data="recordTable" :loading="loading" class="tableCommon" :height="tableHeight"></Table>
-              border
-              ref="selection"
-              :columns="recordColumn"
-              :data="recordTable"
-              :loading="loading"
-              class="tableCommon"
-              :height="tableHeight"
-            ></Table>
                </div>
            </TabPane>
        </Tabs>
-      <Page
+        <Page style="margin-top:10px;" show-elevator show-sizer :total="total" :page-size-opts="showPagesize" :page-size="pageSize" :current="current" @on-change="pageChange" @on-page-size-change="pageSizeChange" />
-        style="margin-top:10px;"
-        show-elevator
-        show-sizer
-        :total="total"
-        :page-size-opts="showPagesize"
-        :page-size="pageSize"
-        :current="current"
-        @on-change="pageChange"
-        @on-page-size-change="pageSizeChange"
-      />
    </Content>
    <!-- 待审核弹框 -->
    <Modal v-model="modalDai" width="360" :mask-closable="false" title="待审核">
@@ -95,12 +53,7 @@
                </RadioGroup>
            </FormItem>
            <FormItem label="备注">
-          <Input
+                <Input v-model="formItem.auditIdea" type="textarea" :autosize="{ minRows: 2, maxRows: 5 }" placeholder="Enter something..."></Input>
-            v-model="formItem.auditIdea"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 5 }"
-            placeholder="Enter something..."
-          ></Input>
            </FormItem>
        </Form>
        <div slot="footer">
@@ -118,13 +71,7 @@
        </div>
    </Modal>
    <!-- 列设置抽屉 -->
-    <Drawer-Set
+    <Drawer-Set :isShow="drawerShow" :tcolumn="column" :newColumn="newColumn" @close="drawerShow = false" @updateCol="updateColumn"></Drawer-Set>
-      :isShow="drawerShow"
-      :tcolumn="column"
-      :newColumn="newColumn"
-      @close="drawerShow = false"
-      @updateCol="updateColumn"
-    ></Drawer-Set>
    <!-- 高级搜索弹框 -->
    <Search-Box ref="searchBox" @heightSearch="gSearch"></Search-Box>
    <!-- 订单报价 -->
@@ -134,17 +81,9 @@
    <Metal-Details ref="metalDetail" :resultDetils="resultDetils"></Metal-Details>
    <Photosensitive-Details ref="photosensitiveDetail" :resultDetils="resultDetils"></Photosensitive-Details>
    <!-- 报价记录里送审 -->
-    <MetalQuotation-Generation
+    <MetalQuotation-Generation ref="metalQuotationExamine" :childData="zPhotosensitive" @update="update"></MetalQuotation-Generation>
-      ref="metalQuotationExamine"
+    <Photosensitive-Generation ref="photosensitiveExamine" :childData="zPhotosensitive" @update="update"></Photosensitive-Generation>
-      :childData="zPhotosensitive"
+</Layout>
-      @update="update"
-    ></MetalQuotation-Generation>
-    <Photosensitive-Generation
-      ref="photosensitiveExamine"
-      :childData="zPhotosensitive"
-      @update="update"
-    ></Photosensitive-Generation>
-  </Layout>
 </template>
 <script>
@@ -217,8 +156,12 @@ export default {
            drawerShow: false,
            newColumn: [], //订单报价
            tableHeight: "",
-      column: [
+            column: [{
-        { type: "selection", width: 70, align: "center", fixed: "left" },
+                    type: "selection",
+                    width: 70,
+                    align: "center",
+                    fixed: "left"
+                },
                {
                    title: "序号",
                    type: "index",
@@ -233,7 +176,12 @@ export default {
                    align: "center",
                    fixed: "left"
                },
-        { title: "产品名称", key: "productName", width: 120, fixed: "left" },
+                {
+                    title: "产品名称",
+                    key: "productName",
+                    width: 120,
+                    fixed: "left"
+                },
                {
                    title: "报价状态",
                    key: "orderQuotationStatus",
@@ -302,12 +250,17 @@ export default {
                            props: {
                                code: "plan.order.material",
                                type: "text",
-                value: params.row.materialId + ""
+                                value: params.row.materialId ? (params.row.materialId + "") : ""
                            }
                        });
                    }
                },
-        { title: "数量", key: "quantity", minWidth: 80, align: "right" },
+                {
+                    title: "数量",
+                    key: "quantity",
+                    minWidth: 80,
+                    align: "right"
+                },
                {
                    title: "甲方客户",
                    key: "guestName",
@@ -337,7 +290,11 @@ export default {
                        });
                    }
                },
-        { title: "厂内责任机关", key: "functionaryOffice", width: 140 },
+                {
+                    title: "厂内责任机关",
+                    key: "functionaryOffice",
+                    width: 140
+                },
                {
                    title: "厂内主体责任部门",
                    key: "mainDepartmentId",
@@ -352,14 +309,23 @@ export default {
                        });
                    }
                },
-        { title: "备注", key: "remark", width: 120, tooltip: true },
+                {
+                    title: "备注",
+                    key: "remark",
+                    width: 120,
+                    tooltip: true
+                },
                {
                    title: "任务输入日期",
                    key: "taskInputDate",
                    width: 180,
                    align: "center"
                },
-        { title: "任务节点要求", key: "taskRequire", width: 150 },
+                {
+                    title: "任务节点要求",
+                    key: "taskRequire",
+                    width: 150
+                },
                {
                    title: "甲方投产输入文件（编号）",
                    key: "putintDocmentCode",
@@ -370,12 +336,36 @@ export default {
                    key: "technologyDocmentCode",
                    width: 220
                },
-        { title: "外部图号/模型号", key: "outerDrawnNumber", width: 180 },
+                {
-        { title: "模型版本", key: "modelVersion", width: 120 },
+                    title: "外部图号/模型号",
-        { title: "甲方任务号", key: "taskCode", width: 120 },
+                    key: "outerDrawnNumber",
-        { title: "甲方设计人员", key: "designer", width: 150 },
+                    width: 180
-        { title: "厂内机关负责人", key: "officeFunctionary", width: 150 },
+                },
-        { title: "厂内主工艺人员", key: "mainRoutingPeople", width: 150 }
+                {
+                    title: "模型版本",
+                    key: "modelVersion",
+                    width: 120
+                },
+                {
+                    title: "甲方任务号",
+                    key: "taskCode",
+                    width: 120
+                },
+                {
+                    title: "甲方设计人员",
+                    key: "designer",
+                    width: 150
+                },
+                {
+                    title: "厂内机关负责人",
+                    key: "officeFunctionary",
+                    width: 150
+                },
+                {
+                    title: "厂内主工艺人员",
+                    key: "mainRoutingPeople",
+                    width: 150
+                }
            ],
            dataTable: []
        };
@@ -395,7 +385,10 @@ export default {
            }
        });
    },
-  async fetch({ store, params }) {
+    async fetch({
+        store,
+        params
+    }) {
        await store.dispatch("loadDictionary"); // 加载数据字典
    },
    mounted() {
@@ -490,12 +483,16 @@ export default {
                            }
                        });
                        this.dataTable = res.result.items;
-            this.materialId = res.result.items[0].materialId;
+                        try {
+                            this.materialId = res.result.items[0].materialId
+                        } catch (err) {
+                            this.materialId = null
+                        }
                    });
            }
            if (this.selectName == "record") {
-        this.recordColumn = [
+                this.recordColumn = [{
-          {
                        type: "index",
                        width: 65,
                        title: "序号",
@@ -508,8 +505,7 @@ export default {
                        render: (h, params) =>
                            h("div", [
                                h(
-                  "a",
+                                    "a", {
-                  {
                                        on: {
                                            click: () => {
                                                this.infoDetail(params.row);
@@ -561,8 +557,7 @@ export default {
                        },
                        render: (h, params) => {
                            return h(
-                "a",
+                                "a", {
-                {
                                    // on: {
                                    //   click: () => {
                                    //     this.statusData(params.row)
@@ -592,14 +587,15 @@ export default {
                        width: 150,
                        align: "center",
                        render: (h, params) => {
-              return h("div", { class: "action" }, [
+                            return h("div", {
+                                class: "action"
+                            }, [
                                h(
-                  params.row.status === 3 || params.row.status === 4
+                                    params.row.status === 3 || params.row.status === 4 ?
-                    ? "op"
+                                    "op" :
-                    : params.row.status === 1
+                                    params.row.status === 1 ?
-                    ? "op"
+                                    "op" :
-                    : "",
+                                    "", {
-                  {
                                        attrs: {
                                            oprate: "detail"
                                        },
@@ -614,11 +610,11 @@ export default {
                                        }
                                    },
                                    (params.row.status === 3 || params.row.status === 4) &&
-                    !params.row.upCode
+                                    !params.row.upCode ?
-                    ? "重新报价"
+                                    "重新报价" :
-                    : params.row.status === 1 && this.status == 0
+                                    params.row.status === 1 && this.status == 0 ?
-                    ? "送审"
+                                    "送审" :
-                    : ""
+                                    ""
                                )
                            ]);
                        }
@@ -855,5 +851,3 @@ export default {
    }
 };
 </script>
--- a/pages/resourceManagement/train/index.vue
+++ b/pages/resourceManagement/train/index.vue
 <template>
-  <div class="train">
+<div class="train">
    <Row :gutter="16" style="margin-bottom:10px">
        <Col span="4">
        <Input v-model="keys" search placeholder="请输入车辆编号" clearable />
@@ -35,24 +35,14 @@
                </Select>
            </FormItem>
            <FormItem label="出厂时间">
-          <DatePicker
+                <DatePicker type="date" placeholder="Select startTime" v-model="formItem.startTime" style="width: 408px"></DatePicker>
-            type="date"
-            placeholder="Select startTime"
-            v-model="formItem.startTime"
-            style="width: 408px"
-          ></DatePicker>
            </FormItem>
            <FormItem label="配属时间">
-          <DatePicker
+                <DatePicker type="date" placeholder="Select startTime" v-model="formItem.a1" style="width: 408px"></DatePicker>
-            type="date"
-            placeholder="Select startTime"
-            v-model="formItem.a1"
-            style="width: 408px"
-          ></DatePicker>
            </FormItem>
        </Form>
    </Modal>
-  </div>
+</div>
 </template>
 <script>
@@ -75,8 +65,7 @@ export default {
            },
            modal: false,
            modal1: false,
-      columns: [
+            columns: [{
-        {
                    title: "序号",
                    type: "index",
                    width: 60,
@@ -114,8 +103,7 @@ export default {
                    render: (h, params) => {
                        return h("div", [
                            h(
-                "op",
+                                "op", {
-                {
                                    props: {
                                        type: "detail",
                                        size: "small",
@@ -132,8 +120,7 @@ export default {
                                "编辑"
                            ),
                            h(
-                "op",
+                                "op", {
-                {
                                    props: {
                                        type: "detail",
                                        size: "small",
@@ -153,8 +140,7 @@ export default {
                    },
                },
            ],
-      data: [
+            data: [{
-        {
                    name: "CR200J3001",
                    name1: "CR200J",
                    startTime: "2017-02-05",
@@ -231,18 +217,18 @@ export default {
                title: "删除",
                content: "<p>您确定删除此信息？</p>",
                onOk: () => {
-          this.$Message.info("Clicked ok");
+                    this.$Message.info("操作成功");
                },
                onCancel: () => {
-          this.$Message.info("Clicked cancel");
+                    this.$Message.info("取消操作");
                },
            });
        },
        ok() {
-      this.$Message.info("Clicked ok");
+            this.$Message.info("操作成功");
        },
        cancel() {
-      this.$Message.info("Clicked cancel");
+            this.$Message.info("取消操作");
        },
    },
 };
@@ -251,9 +237,11 @@ export default {
 <style lang="less">
 .train {
    padding-top: 10px;
    .ivu-form-item-content {
        float: left;
    }
    .page-v {
        text-align: right;
        margin-top: 10px;

--- a/static/config.js
+++ b/static/config.js
@@ -11,6 +11,7 @@ let address=systemApi.dev;
 window.systemUrl = `http://${address}:10000/system`; //System-api 系统管理（基础数据）
 window.authUrl = `http://${address}:10010`; //Authentication-api //统一登录认证  
+window.UserUrl = `http://${address}:10130`; //Authentication-api //用户信息 密码修改。重置等
 window.designUrl = `http://${address}:10000/process`; // 工艺规程
 window.PlanUrl = `http://${address}:10000/plan`; //订单
 // window.PlanUrl = `http://localhost:10050/api/services/app`; //Process-api