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

pages/aps/ai/editDuration.vue

@@ -21,7 +21,7 @@
     </Form>
     <Row>
       <Col span="24" style="text-align:right;height:60px;line-height:60px">
-        <Button type="primary" @click="handleSubmit">确定</Button>
+        <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
       </Col>
     </Row>

pages/aps/ai/options.vue

@@ -138,7 +138,7 @@
         </Col>
       </Row>
       <FormItem class="click-btn">
-        <Button type="primary" @click="handleSubmit">确定</Button>
+        <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
       </FormItem>
     </Form>

pages/aps/aps/editDuration.vue

@@ -21,7 +21,7 @@
     </Form>
     <Row>
       <Col span="24" style="text-align:right;height:60px;line-height:60px">
-        <Button type="primary" @click="handleSubmit">确定</Button>
+        <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
       </Col>
     </Row>

pages/aps/aps/options.vue

@@ -138,7 +138,7 @@
         </Col>
       </Row>
       <FormItem class="click-btn">
-        <Button type="primary" @click="handleSubmit">确定</Button>
+        <Button type="primary" @click="handleSubmit" v-noClick>确定</Button>
         <Button @click="handleClose" class="ml20">取消</Button>
       </FormItem>
     </Form>

pages/aps/complete/index.vue

@@ -96,7 +96,7 @@
         </FormItem>
         <FormItem>
           <Button style="margin-left: 8px" @click="closeOk">取消</Button>
-          <Button type="primary" @click="lowerHair">下发</Button>
+          <Button type="primary" @click="lowerHair" v-noClick>下发</Button>
         </FormItem>
       </Form>
     </div>

pages/aps/dispatch/index.vue

@@ -254,7 +254,7 @@
         </Row>
         <FormItem>
           <Button style="margin-right: 8px" @click="cancle">取消</Button>
-          <Button type="primary" @click="sendSheBei">派工</Button>
+          <Button type="primary" @click="sendSheBei" v-noClick>派工</Button>
         </FormItem>
       </Form>
     </Drawer>

pages/aps/plan/addAccessory.vue

@@ -42,7 +42,6 @@ export default {
     name: "addAccessory",
     data() {
         return {
-            disabled: false,
             deletelModal: false,
             curId: 0,
             editIndex: -1,

pages/aps/plan/detailAccessory.vue

@@ -43,7 +43,7 @@ export default {
   name: "detailAccessory",
   data() {
     return {
-      disabled: false,
+    
       deletelModal: false,
       statuList: this.$store.getters.dictionaryByKey("accessory.status") || [],
       statuList1: this.$store.getters.dictionaryByKey("outstore.status") || [],

pages/aps/plan/dispatch.vue

@@ -2,99 +2,104 @@
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
       <Col span="12">
-        <FormItem :label="l('DistributeMainRouting')" prop="DistributeMainRouting">
-          <UserSelect ref="userSelected" v-model="entity.DistributeMainRouting" />
+        <FormItem
+          :label="l('DistributeMainRouting')"
+          prop="DistributeMainRouting"
+        >
+          <UserSelect
+            ref="userSelected"
+            v-model="entity.DistributeMainRouting"
+          />
         </FormItem>
       </Col>
       <Col span="12">
-        <FormItem label="完成时间" style="width:100%" prop="MainRoutingFinishDate">
+        <FormItem
+          label="完成时间"
+          style="width: 100%"
+          prop="MainRoutingFinishDate"
+        >
           <DatePicker
             v-model="entity.MainRoutingFinishDate"
             type="datetime"
             placeholder="请选择日期"
-            style="width:240px"
+            style="width: 240px"
             @on-change="getTimeMainRFD"
           ></DatePicker>
         </FormItem>
       </Col>
     </Row>
-    <Row >
-    &nbsp;
-    </Row>
-    <Row >
-    &nbsp;
-    </Row>
+    <Row> &nbsp; </Row>
+    <Row> &nbsp; </Row>
     <FormItem>
-      <Button type="primary" @click="handleSubmit" :disabled="disabled">保存</Button>
+      <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
       <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
   </Form>
 </template>
     <script>
-import Api from './api'
+import Api from "./api";
 export default {
-  name: 'Dispatch',
+  name: "Dispatch",
   props: {
-    ids: Array
+    ids: Array,
   },
   data() {
     return {
-      disabled: false,
       entity: {
         DistributeMainRouting: null,
-        MainRoutingFinishDate: ''
+        MainRoutingFinishDate: "",
       },
       rules: {
         DistributeMainRouting: [
           {
             required: true,
-            message: '请选择人员',
-            trigger: 'change',
-            type: 'number'
-          }
+            message: "请选择人员",
+            trigger: "change",
+            type: "number",
+          },
         ],
         MainRoutingFinishDate: [
           {
             required: true,
-            message: '请选择时间',
-            trigger: 'change'
-          }
-        ]
-      }
-    }
+            message: "请选择时间",
+            trigger: "change",
+          },
+        ],
+      },
+    };
   },
   methods: {
     handleSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
-          this.entity.ids = this.ids
+          this.entity.ids = this.ids;
           Api.routingdistribute(this.entity)
             .then((r) => {
               if (r.success) {
-                this.$Message.success('工艺派发成功')
-                this.$emit('on-ok')
+                this.$Message.success("工艺派发成功");
+                this.$emit("on-ok");
               } else {
-                this.$Message.error('工艺派发失败')
+                this.$Message.error("工艺派发失败");
               }
-              this.$emit('on-ok')
+              this.$emit("on-ok");
             })
             .catch((err) => {
-              this.$Message.error('工艺派发失败')
-            })
+              this.$Message.error("工艺派发失败");
+            });
         }
-      })
+      });
     },
     handleClose() {
-      this.$emit('on-close')
+      this.$emit("on-close");
     },
     l(key) {
-      key = 'mes_order' + '.' + key
-      return this.$t(key)
+      key = "mes_order" + "." + key;
+      return this.$t(key);
     },
     getTimeMainRFD(value) {
-      this.entity.MainRoutingFinishDate = value
-    }
+      this.entity.MainRoutingFinishDate = value;
+    },
   },
-  watch: {}
-}
+  watch: {},
+};
 </script>

pages/mesPlan/split.vue

@@ -40,7 +40,7 @@
         <Col span="12">
           <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
             <InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
-            <Button type="primary" @click="addSplitOrder">确定</Button>
+            <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
           </FormItem>
         </Col>
       </Row>

pages/mordent/Sluggish/powder/index.vue

@@ -68,7 +68,7 @@
             <Col span="16">&nbsp;</Col>
             <Col span="8">
               <Button @click="cancel" class="ml20">取消</Button>
-              <Button type="primary" @click="setNumOk">设置</Button>
+              <Button type="primary" @click="setNumOk" v-noClick>设置</Button>
             </Col>
           </Row>
         </Form>

pages/project/plan/add.vue

 <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
-    <!--   <Col :span="12"
+      <!--   <Col :span="12"
         ><FormItem :label="l('creationTime')" prop="creationTime">
           <DatePicker
             type="date"
@@ -101,9 +101,7 @@
       ></Col>
     </Row>
     <FormItem>
-      <Button type="primary" @click="handleSubmit" :disabled="disabled"
-        >保存</Button
-      >
+      <Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
       <Button @click="handleClose" class="ml20">取消</Button>
     </FormItem>
   </Form>
@@ -114,7 +112,6 @@ export default {
   name: "Add",
   data() {
     return {
-      disabled: false,
       entity: {
         // creationTime: null,
         // creatorUserId: null,
@@ -152,10 +149,8 @@ export default {
     handleSubmit() {
       this.$refs.form.validate((v) => {
         if (v) {
-          this.disabled = true;
           Api.create(this.entity)
             .then((r) => {
-              this.disabled = false;
               if (r.success) {
                 this.$Message.success("保存成功");
                 this.$emit("on-ok");
@@ -164,7 +159,6 @@ export default {
               }
             })
             .catch((err) => {
-              this.disabled = false;
               this.$Message.error("保存失败");
               console.warn(err);
             });

pages/project/project/add.vue

 <template>
   <Form ref="form" :model="entity" :rules="rules" :label-width="90">
     <Row>
-      <Col span="8">
+      <Col span="8" class="projct-img">
         <FormItem :label="l('picture')" prop="picture">
           <inputFile
             class="tphoto"
@@ -137,7 +137,7 @@ export default {
   name: "Add",
   data() {
     return {
-      disabled: false,
+     
       imgName: "",
       avatorPath: "",
       entity: {
@@ -155,12 +155,12 @@ export default {
         picture: "",
         attachment: "",
         phase: null,
-        startDate: null,
-        endDate: null,
+        startDate: "",
+        endDate: "",
         businessUnits: "",
       },
       rules: {
-        name: [{ required: true, message: "必填", trigger: "blur" }],
+        title: [{ required: true, message: "必填", trigger: "blur" }],
       },
       parmsName: "app=material&eid=1&name=ProjectMain",
       parms: {
@@ -196,7 +196,7 @@ export default {
           }
           Api.create(this.entity)
             .then((r) => {
-              this.disabled = false;
+           
               if (r.success) {
                 this.$Message.success("保存成功");
                 this.$emit("on-ok");
@@ -205,7 +205,7 @@ export default {
               }
             })
             .catch((err) => {
-              this.disabled = false;
+            
               this.$Message.error("保存失败");
               console.warn(err);
             });
@@ -221,6 +221,8 @@ export default {
         this.entity.id = 0;
       });
     },
+
+    //时间相关end
     l(key) {
       key = "project_main" + "." + key;
       return this.$t(key);
@@ -243,4 +245,19 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>
+<style lang="less">
+.projct-img {
+  .img-touxiang {
+    width: 300px;
+    height: 300px;
+    margin: 0px 10px 15px 20px;
+    overflow: hidden;
+    border-radius: 5px;
+    .img1 {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file

pages/project/project/detail.vue

 <template>
-    <div class="detail">
-
-        <Row>
-<Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
-<Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
-<Filed :span="12" :name="l('lastModificationTime')">{{entity.lastModificationTime}}</Filed>
-<Filed :span="12" :name="l('lastModifierUserId')">{{entity.lastModifierUserId}}</Filed>
-<Filed :span="12" :name="l('isDeleted')">{{entity.isDeleted}}</Filed>
-<Filed :span="12" :name="l('deletionTime')">{{entity.deletionTime}}</Filed>
-<Filed :span="12" :name="l('deleterUserId')">{{entity.deleterUserId}}</Filed>
-<Filed :span="12" :name="l('title')">{{entity.title}}</Filed>
-<Filed :span="24" :name="l('note')">{{entity.note}}</Filed>
-<Filed :span="12" :name="l('state')">{{entity.state}}</Filed>
-<Filed :span="12" :name="l('type')">{{entity.type}}</Filed>
-<Filed :span="12" :name="l('picture')">{{entity.picture}}</Filed>
-<Filed :span="12" :name="l('attachment')">{{entity.attachment}}</Filed>
-<Filed :span="12" :name="l('phase')">{{entity.phase}}</Filed>
-<Filed :span="12" :name="l('startDate')">{{entity.startDate}}</Filed>
-<Filed :span="12" :name="l('endDate')">{{entity.endDate}}</Filed>
-<Filed :span="12" :name="l('businessUnits')">{{entity.businessUnits}}</Filed>
-        </Row>
-       
-    </div>
+  <div class="detail">
+    <Row>
+      <Filed :span="12" :name="l('creationTime')">{{
+        entity.creationTime
+      }}</Filed>
+      <Filed :span="12" :name="l('creatorUserId')">
+        <User :value="entity.creatorUserId" />
+      </Filed>
+      <!-- <Filed :span="12" :name="l('lastModificationTime')">{{
+        entity.lastModificationTime
+      }}</Filed>
+      <Filed :span="12" :name="l('lastModifierUserId')">{{
+        entity.lastModifierUserId
+      }}</Filed>
+      <Filed :span="12" :name="l('isDeleted')">{{ entity.isDeleted }}</Filed>
+      <Filed :span="12" :name="l('deletionTime')">{{
+        entity.deletionTime
+      }}</Filed>
+      <Filed :span="12" :name="l('deleterUserId')">{{
+        entity.deleterUserId
+      }}</Filed> -->
+      <Filed :span="12" :name="l('title')">{{ entity.title }}</Filed>
+      <Filed :span="12" :name="l('state')">
+        <state code="project.main.state" :value="entity.state"
+      /></Filed>
+      <!-- <Filed :span="12" :name="l('phase')">{{ entity.phase }}</Filed> -->
+      <Filed :span="12" :name="l('startDate')">{{ entity.startDate }}</Filed>
+      <Filed :span="12" :name="l('endDate')">{{ entity.endDate }}</Filed>
+      <!-- <Filed :span="12" :name="l('businessUnits')">{{
+        entity.businessUnits
+      }}</Filed> -->
+      <Filed :span="12" :name="l('type')">
+        <state code="project.main.type" :value="entity.type" />
+      </Filed>
+      <Filed :span="12" :name="l('picture')"
+        ><a @click="imgClick(entity.picture)">查看图片</a></Filed
+      >
+      <Filed :span="12" :name="l('attachment')">
+        <files ref="refFile" :parms="parms" fileFormat :showList="false" />
+      </Filed>
+      <Filed :span="24" :name="l('note')">{{ entity.note }}</Filed>
+    </Row>
+  </div>
 </template>
 <script>
-    import Api from './api'
-    export default {
-        name: 'Add',
-        data() {
-            return {
-                entity: {},
-                rules: {
-                    name: [{ required: true, message: '必填', trigger: 'blur' }],
-                    code: [{ required: true, message: '必填', trigger: 'blur' }]
-                }
-            }
-        },
-        props: {
-            eid: Number
-        },
-        mounted() {
-            if (this.eid > 0) {
-                this.load(this.eid);
-            }
-        },
-        methods: {
-            load(v) {
-                Api.get({ id: v }).then(r => {
-                    this.entity = r.result;
-                    this.$emit('on-load')
-                })
-            },
-            handleClose() {
-                this.$emit('on-close')
-            },
-      l(key) {
-          key = "project_main" + "." + key;
-          return this.$t(key)
+import Api from "./api";
+export default {
+  name: "Add",
+  data() {
+    return {
+      entity: {},
+      rules: {
+        name: [{ required: true, message: "必填", trigger: "blur" }],
+        code: [{ required: true, message: "必填", trigger: "blur" }],
+      },
+      parms: {
+        app: "material",
+        eid: null,
+        name: "",
+        field: "",
+      },
+    };
+  },
+  props: ["eid"],
+  mounted() {
+    this.load(this.eid);
+  },
+  methods: {
+    imgClick(img) {
+      window.open(fileUrlDown + img, "_blank");
+    },
+    load(v) {
+      Api.get({ id: v }).then((r) => {
+        this.entity = r.result;
+        this.entity.type = r.result.type + "";
+        this.entity.state = r.result.state + "";
+
+        this.parms.eid = r.result.attachment;
+
+        this.$emit("on-load");
+      });
+    },
+    handleClose() {
+      this.$emit("on-close");
+    },
+    l(key) {
+      key = "project_main" + "." + key;
+      return this.$t(key);
+    },
+  },
+  watch: {
+    eid(v) {
+      if (v) {
+        this.load(v);
       }
-        },
-        watch: {
-            eid(v) {
-                if (v > 0) {
-                    this.load(v);
-                }
-            }
-        }
-    }
+    },
+  },
+};
 </script>
\ No newline at end of file

pages/word/classification/add.vue

@@ -461,7 +461,7 @@ export default {
               }
             })
             .catch((err) => {
-              this.disabled = false;
+            
               this.$Message.error("保存失败");
               console.warn(err);
             });

pages/word/document/word.vue

@@ -18,6 +18,7 @@
             <Input
               placeholder="请输入文档名称/编号"
               v-model="easySearch.keys.value"
+              clearable
             />
           </FormItem>
           <FormItem>
@@ -429,6 +430,7 @@ export default {
       }
       .shuo-ming {
         display: -webkit-inline-box;
+        // display: inline-block;
       }
       .a-icon {
         text-align: right;