bug

pages/aps/complete/index.vue

 <template>
+  <div>
+    <div class="back-href">
+      <a @click="viewClose">
+        <Icon type="ios-undo-outline" size="24" />返回计划管理
+      </a>
+    </div>
     <div class="scheduling">
       <div class="aps-l">
         <Row class="row-p">
@@ -101,6 +107,7 @@
         </Form>
       </div>
     </div>
+  </div>
 </template>
 <script>
 import Api from "./api";
@@ -126,7 +133,7 @@ export default {
         showSet: false,
         // userName: ""
       },
-      user:'',
+      user: "",
       showSet: false,
       //   listGroup: [
       //     {
@@ -169,6 +176,9 @@ export default {
     this.orderlist(0);
   },
   methods: {
+    viewClose() {
+      this.$router.push("/aps/plan");
+    },
     // 过滤条件
     changeStatus(name) {
       this.status = name;
@@ -338,6 +348,9 @@ export default {
 </script>
 <style lang="less" scoped>
 @import "../../../assets/css/custom.less";
+.back-href {
+  height: 35px;
+}
 .addclass {
   border-color: rgba(38, 128, 235, 0.2) !important;
   .title-i {

pages/aps/stream/index.vue

 <template>
+  <div>
+    <div class="back-href">
+      <a @click="viewClose">
+        <Icon type="ios-undo-outline" size="24" />返回计划管理
+      </a>
+    </div>
+
     <div class="scheduling">
       <div class="aps-l">
         <Row class="row-p">
@@ -156,6 +163,7 @@
         ></Slider>
       </Modal>
     </div>
+  </div>
 </template>
 <script>
 import Set from "./set";
@@ -197,6 +205,9 @@ export default {
     this.orderlist(0);
   },
   methods: {
+    viewClose() {
+      this.$router.push("/aps/plan");
+    },
     // 排产池过滤条件
     changeStatus(a) {
       this.status = a;

pages/qc/certificate/waitOpened/add.vue

@@ -211,7 +211,7 @@ export default {
       disabled: false,
       entity: {
         id: 0,
-        status: "",
+        status: 0,
         items: [],
       },
       rules: {
@@ -225,6 +225,7 @@ export default {
       columns: [
         {
           title: "序号",
+          // key: "index",
           type: "index",
           width: 80,
           align: "center",
@@ -308,7 +309,8 @@ export default {
       let item = [];
       item = this.checkList;
       if (item) {
-        item.forEach((c) => {
+        item.forEach((c, index) => {
+          c.index = index;
           return delete c.id;
         });
       }

pages/resource/resource/index.vue

 <template>
-<Layout class="full">
+  <Layout class="full">
     <Sider hide-trigger v-if="showMenu" class="menu_side" width="300">
       <StoreTree @on-hide="onHide" @on-select="productSearch" />
     </Sider>
@@ -10,12 +10,27 @@
       </a>
     </div>
 
-    <Content class="content" :class="!showMenu?'con_bord':''">
-        <DataGrid :columns="columns" ref="grid" :action="action" :conditions="easySearch" :batch="true" :format="checkData" @all-change="allchange" @on-selection-change="onSelect" exportTitle="制造资源">
+    <Content class="content" :class="!showMenu ? 'con_bord' : ''">
+      <DataGrid
+        :columns="columns"
+        ref="grid"
+        :action="action"
+        :conditions="easySearch"
+        :batch="true"
+        :format="checkData"
+        @all-change="allchange"
+        @on-selection-change="onSelect"
+        exportTitle="制造资源"
+      >
         <template slot="easySearch">
           <Form ref="formInline" :model="easySearch" inline>
             <FormItem prop="keys">
-                        <Input clearable placeholder="请输入资源名称/资源编码/编码" v-model.trim="easySearch.keys.value" v-width="260" />
+              <Input
+                clearable
+                placeholder="请输入资源名称/资源编码/编码"
+                v-model.trim="easySearch.keys.value"
+                v-width="260"
+              />
             </FormItem>
             <FormItem>
               <Button type="primary" @click="search">查询</Button>
@@ -28,21 +43,55 @@
         <template slot="buttons">
           <Button type="primary" @click="add">入库</Button>
           <!-- <Button type="primary" @click="returnModel=true">归还</Button> -->
-                <Badge :count="this.$store.state.count" overflow-count="99" style="margin-right:5px;" :offset='postion'>
+          <Badge
+            :count="this.$store.state.count"
+            overflow-count="99"
+            style="margin-right: 5px"
+            :offset="postion"
+          >
             <Button icon="md-cart" @click="showCart">借出车</Button>
           </Badge>
           <Button @click="openModalIm">导入</Button>
         </template>
         <template slot="batch">
-                <Button type="primary" class="mr10 ml10" @click="addCart">加入借出车</Button>
+          <Button type="primary" class="mr10 ml10" @click="addCart"
+            >加入借出车</Button
+          >
         </template>
       </DataGrid>
-        <Modal v-model="modal" :title="title" width="1200" footer-hide :fullscreen="fscreeen">
-            <component :is="detail" :eid="curId" :rootName="rootName" :storeTitle="storeTitle" :materialType="materialType" :codeRuleType="codeRuleType" :storeId="storeId" :mcode="mCode" :cartList="this.$u.clone(this.$store.state.cart)" @on-close="cancel" @on-ok="ok" @substr="substr" />
+      <Modal
+        v-model="modal"
+        :title="title"
+        width="1200"
+        footer-hide
+        :fullscreen="fscreeen"
+      >
+        <component
+          :is="detail"
+          :eid="curId"
+          :rootName="rootName"
+          :storeTitle="storeTitle"
+          :materialType="materialType"
+          :codeRuleType="codeRuleType"
+          :storeId="storeId"
+          :mcode="mCode"
+          :cartList="this.$u.clone(this.$store.state.cart)"
+          @on-close="cancel"
+          @on-ok="ok"
+          @substr="substr"
+        />
       </Modal>
-        <ImportExcel ref="importExcel" @on-get-data="getData" modalTitle="制造资源" :columns="columns" :open="ModalIm" @on-cancel="ModalImCancel" @on-ok="ok" />
+      <ImportExcel
+        ref="importExcel"
+        @on-get-data="getData"
+        modalTitle="制造资源"
+        :columns="columns"
+        :open="ModalIm"
+        @on-cancel="ModalImCancel"
+        @on-ok="ok"
+      />
     </Content>
-</Layout>
+  </Layout>
 </template>
 
 <script>
@@ -79,7 +128,8 @@ export default {
       storeTitle: "",
       materialType: "",
       mCode: "",
-            columns: [{
+      columns: [
+        {
           key: "selection",
           type: "selection",
           width: 50,
@@ -101,8 +151,13 @@ export default {
           width: 60,
           render: (h, params) => {
             return h(
-                            "div", {
+              "Tooltip",
+              {
                 class: "action",
+                props: {
+                  content: "请加入借出车",
+                  placement: "top",
+                },
               },
               [
                 h(params.row.numberAvailable > 0 ? "op" : "", {
@@ -257,18 +312,22 @@ export default {
           hide: false,
           render: (h, params) => {
             return h(
-                            "div", {
+              "div",
+              {
                 class: "action",
               },
               [
                 h(
-                                    "op", {
+                  "op",
+                  {
                     attrs: {
                       oprate: "delete",
                       title: "删除",
                     },
-                                        class: params.row.totalNum === params.row.numberAvailable ?
-                                            "remove" : "disable",
+                    class:
+                      params.row.totalNum === params.row.numberAvailable
+                        ? "remove"
+                        : "disable",
                     on: {
                       click: () => this.remove(params.row),
                     },
@@ -276,7 +335,8 @@ export default {
                   "删除"
                 ),
                 h(
-                                    "op", {
+                  "op",
+                  {
                     attrs: {
                       oprate: "detail",
                       title: "查看日志",
@@ -317,10 +377,7 @@ export default {
       })();
     };
   },
-    async fetch({
-        store,
-        params
-    }) {
+  async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   computed: {},

pages/technology/details/routingsupporting/index.vue

@@ -94,15 +94,15 @@ export default {
                     import: true,
                 },
 
-                {
-                    key: "materialType",
-                    title: this.l("materialType"),
-                    align: "center",
-                    easy: true,
-                    high: true,
-                    code: "mes_xingchi_resource.material.materialReType",
-                    width: 100,
-                },
+                // {
+                //     key: "materialType",
+                //     title: this.l("materialType"),
+                //     align: "center",
+                //     easy: true,
+                //     high: true,
+                //     code: "mes_xingchi_resource.material.materialReType",
+                //     width: 100,
+                // },
                 {
                     key: "materialNumber",
                     title: this.l("materialNumber"),