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

pages/word/document/add.vue

@@ -170,7 +170,9 @@
                   <!-- <Input v-model="entity.template" type="textarea" :rows="5"></Input> -->
                   <files ref="refFile" :parms="parms" files />
                 </FormItem>
-                <a href="#" @click="template" class="a-xiazai">下载模板</a>
+                <a href="#" @click="template" class="a-xiazai" v-if="templateId"
+                  >下载模板</a
+                >
               </div>
             </Col>
             <!-- <Col :span="12">
@@ -238,6 +240,7 @@ export default {
         categoryId: this.treeId,
         img: "",
         code: "",
+        workFlowIds: this.workFlowIds,
         // title: "",
         // field: "",
         // dataType: null,
@@ -277,6 +280,8 @@ export default {
     v: Object,
     treeId: Number,
     eid: Number,
+    workFlowIds: String,
+    templateId: String,
   },
   created() {},
   mounted() {
@@ -367,6 +372,7 @@ export default {
       Api.get({ id: v }).then((r) => {
         this.entity = r.result;
         this.avatorPath = fileUrlDown + r.result.img;
+
         this.imgName = r.result.img;
         this.entity.status = r.result.status;
         if (r.result.filePath && r.result.filePath != "") {

pages/word/document/edit.vue

@@ -170,7 +170,9 @@
                 <!-- <Input v-model="entity.template" type="textarea" :rows="5"></Input> -->
                 <files ref="refFile" :parms="parms" files />
               </FormItem>
-              <a href="#" @click="template" class="a-xiazai">下载模板</a>
+              <a href="#" @click="template" class="a-xiazai" v-if="templateId"
+                >下载模板</a
+              >
             </div>
           </Col>
           <!-- <Col :span="12">
@@ -228,7 +230,9 @@ export default {
     return {
       imgName: "",
       avatorPath: "",
-      entity: {},
+      entity: {
+        workFlowIds: this.workFlowIds,
+      },
       rules: {
         name: [{ required: true, message: "必填", trigger: "blur" }],
       },
@@ -242,7 +246,7 @@ export default {
       },
     };
   },
-  props: ["eid", "treeId"],
+  props: ["eid", "treeId", "workFlowIds", "templateId"],
   mounted() {
     this.initFiled();
     this.parms.eid = this.$u.guid();

pages/word/document/index.vue

@@ -16,6 +16,7 @@
           :addShow="addShow"
           :ids="ids"
           :workFlowIds="workFlowIds"
+          :templateId="templateId"
         />
       </Content>
     </Layout>
@@ -42,6 +43,7 @@ export default {
       addShow: false,
       ids: [],
       workFlowIds: "",
+      templateId: "",
     };
   },
   mounted() {},
@@ -53,6 +55,7 @@ export default {
     change(item, ids) {
       this.treeId = item.id;
       this.workFlowIds = item.workFlowIds;
+      this.templateId = item.templateId;
       this.ids = ids;
     },
     hide() {

pages/word/document/word.vue

@@ -88,7 +88,10 @@
                 > 
                 <a @click="view(row.id)"> <Icon type="md-document" />详情 </a>
                 &nbsp;
-                <a @click="sub(row.id)" v-if="row.status == 1">
+                <a
+                  @click="sub(row.id)"
+                  v-if="row.status == 1 && row.workFlowIds"
+                >
                   <Icon type="md-color-wand" />送审
                 </a>
               </div>
@@ -112,6 +115,7 @@
         :treeId="treeId"
         :rowsTable="rowsTable"
         :workFlowIds="workFlowIds"
+        :templateId="templateId"
         @on-close="cancel"
         @on-ok="ok"
       />
@@ -136,7 +140,7 @@ export default {
       title: "新增",
       detail: null,
       curId: 0,
-   
+
       columns: [
         {
           type: "selection",
@@ -226,7 +230,7 @@ export default {
                   attrs: { oprate: "detail" },
                   on: { click: () => this.sub(params.row.id) },
                 },
-                params.row.status == 1 ? "送审" : ""
+                params.row.status == 1 && params.row.workFlowIds ? "送审" : ""
               ),
             ]);
           },
@@ -246,6 +250,7 @@ export default {
     addShow: Boolean,
     ids: Array,
     workFlowIds: String,
+    templateId: String,
   },
   async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典