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

components/page/dataGrid.vue

@@ -49,6 +49,7 @@
       @on-drag-drop="onDragDrop"
       @on-selection-change="selectionChange"
       @on-select="onSelect"
+      :loading="loading"
     ></Table>
     <div class="table-footer">
       <div>
@@ -138,7 +139,8 @@ export default {
       configLoad: false,
       userConfig: null, //用户页面配置信息。,
       // userId: 1
-      userId: this.$store.state.userInfo.userId
+      userId: this.$store.state.userInfo.userId,
+      loading: false
     };
   },
   props: {
@@ -238,8 +240,8 @@ export default {
       default: 24
     },
     //table控件children子数据控制功能
-    rowKey:{
-      type:[String,Number]
+    rowKey: {
+      type: [String, Number]
     }
   },
   created() {
@@ -251,7 +253,7 @@ export default {
     this.columnsCur = this.$u.clone(this.columns);
   },
   mounted() {
-     if (this.data && this.data.length > 0) {
+    if (this.data && this.data.length > 0) {
       this.list = this.data;
       //return;
     }
@@ -261,7 +263,7 @@ export default {
       return;
     }
     this.loadUserConfig();
-    
+
     if (this.height === 0) {
       window.onresize = () => {
         ///浏览器窗口大小变化
@@ -273,7 +275,7 @@ export default {
     } else {
       this.tableHeight = this.height;
     }
-   
+
     //注册拖拽事件。
     this.$dragging.$on("dragend", e => {
       // console.log("dragend",e);
@@ -287,10 +289,20 @@ export default {
         this.tableHeight = window.innerHeight - this.firstY - 60;
       }
       if (this.action) {
-        this.$api.post(this.action, this.search).then(r => {
-          this.list = r.result.items;
-          this.search.total = r.result.totalCount;
-        });
+        this.loading = true;
+        this.$api
+          .post(this.action, this.search)
+          .then(r => {
+            this.list = r.result.items;
+            this.search.total = r.result.totalCount;
+            this.loading = false;
+          })
+          .catch(
+            function(err) {
+              this.loading = false;
+              this.$Message.error("加载失败");
+            }.bind(this)
+          );
       }
     },
     columnInit() {
@@ -614,5 +626,4 @@ export default {
     color: #249e91;
   }
 }
-
 </style>
\ No newline at end of file

components/page/files.vue

@@ -13,6 +13,7 @@
       :on-format-error="onFormatError"
       multiple
       :style="style"
+      :on-progress="onProgress"
     >
       <div style="padding: 20px 0;text-align:center" v-if="cloudIco">
         <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
@@ -20,6 +21,7 @@
       </div>
       <Button icon="ios-cloud-upload-outline" v-if="!cloudIco">上传文件</Button>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
     <Tag
       v-for="(item,index) in nameList"
       :key="index"
@@ -47,7 +49,9 @@ export default {
       hbaseFileListNew: [],
       formatList: ['png', 'jpg', 'gif'],
       postUrl: '',
-      style: ''
+      style: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -75,11 +79,17 @@ export default {
     }
   },
   methods: {
+    onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     // change(event) {
     //   this.$emit('on-change', event)
     // },
     //上传成功文件
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -89,6 +99,11 @@ export default {
         objImag.id = file.response.data.id
         filesList.push(objImag)
         this.nameList = this.nameList.concat(filesList)
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
       } else {
         this.$Message.error('上传失败，请重新上传!')
       }

components/page/imgUploadFile.vue

@@ -22,9 +22,11 @@
             :on-format-error="onFormatError"
             :show-upload-list="false"
             :files="files"
+            :on-progress="onProgress"
           >
             <Button type="primary" icon="ios-cloud-upload-outline">本地上传</Button>
           </Upload>
+          <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
         </Col>
       </Row>
     </template>
@@ -86,7 +88,9 @@ export default {
         '&' +
         this.parms,
       formatList: ['png', 'jpg', 'gif'],
-      newName: ''
+      newName: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {
@@ -256,11 +260,17 @@ export default {
       this.isCancas = true
       this.isphoto = false
     },
+    onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     //  change(event) {
     //  this.$emit('on-change', event.target.value)
     // },
     //上传成功文件
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -271,6 +281,11 @@ export default {
         this.fileUrlPath = this.downUrl + objImag.filePath
         this.newName = file.response.data.fileName
         this.$emit('on-change', JSON.stringify(filesList))
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
       } else {
         this.$Message.error('上传失败，请重新上传!')
       }

components/page/inputFile.vue

@@ -14,9 +14,11 @@
       :on-format-error="onFormatError"
       :show-upload-list="false"
       :files="files"
+      :on-progress="onProgress"
     >
       <Button icon="ios-cloud-upload-outline">上传文件</Button>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
   </div>
 </template>
 <script>
@@ -40,7 +42,9 @@ export default {
         '&' +
         this.parms,
       formatList: ['png', 'jpg', 'gif'],
-      newName: ''
+      newName: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -60,11 +64,17 @@ export default {
     }
   },
   methods: {
+    onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     //  change(event) {
     //  this.$emit('on-change', event.target.value)
     // },
     //上传成功文件
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -74,6 +84,11 @@ export default {
         filesList.push(objImag)
         this.newName = file.response.data.fileName
         this.$emit('on-change', JSON.stringify(filesList))
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
       } else {
         this.$Message.error('上传失败，请重新上传!')
       }

components/page/workShopSelect.vue

@@ -79,7 +79,7 @@ export default {
   watch: {
     value(v, o) {
       this.name = v
-      console.log(v, o)
+     // console.log(v, o)
     }
   }
 }

layouts/basic-layout/tabs/index.vue

@@ -17,7 +17,7 @@
           :closable="page.meta && page.meta.closable"
         />
       </Tabs>
-      <Dropdown class="i-layout-tabs-close" @on-click="handleClose">
+      <Dropdown class="i-layout-tabs-close" @on-click="handleClose" placement="bottom-end">
         <div class="i-layout-tabs-close-main">
           <Icon type="ios-arrow-down" />
         </div>

pages/aps/aps/components/excute.vue

@@ -128,7 +128,6 @@ export default {
           high: true,
           hide: true
         },
-
         {
           key: "put_into_qty",
           title: this.l("put_into_qty"),

pages/bug/index.vue

@@ -398,9 +398,9 @@ export default {
       }
       param.auditUser = this.$store.state.userInfo.userName
       param.ids = [param.id]
-      param.statusNew = 5
+      param.statusNew = 6
       if (param.id != null) {
-        //增加改变状态为5/查看
+        //增加改变状态为6/查看
         this.$http.bug.doaction(param).then((res) => {
           if (res.result) {
             //this.search(this.searchForm)

pages/mesPlan/add.vue

@@ -37,41 +37,12 @@
         </Col>
       </Row>
       <Row>
-        <Col span="8">
-          <FormItem label="阶段" style="width:100%" prop="stage">
-            <dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
-          </FormItem>
-        </Col>
-        <Col span="8">
-          <FormItem label="材料" style="width:100%" prop="materialId">
-            <dictionary
-              code="plan.order.material"
-              v-model="orderSearchForm.materialId"
-              style="width:240px"
-            ></dictionary>
-          </FormItem>
-        </Col>
+       
         <Col span="8">
           <FormItem label="数量" style="width:100%" prop="quantity">
             <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
           </FormItem>
         </Col>
-      </Row>
-      <Row>
-        <Col span="8">
-          <FormItem label="工艺方法" style="width:100%" prop="routing_Method">
-            <dictionary
-              code="plan.order.routingMethod"
-              v-model="orderSearchForm.routing_Method"
-              style="width:240px"
-            ></dictionary>
-          </FormItem>
-        </Col>
-        <Col span="8">
-          <FormItem label="外包络尺寸(mm)" style="width:100%">
-            <Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
-          </FormItem>
-        </Col>
         <Col span="8">
           <FormItem label="开始时间" style="width:100%">
             <DatePicker
@@ -83,8 +54,6 @@
             ></DatePicker>
           </FormItem>
         </Col>
-      </Row>
-      <Row>
         <Col span="8">
           <FormItem label="完成时间" style="width:100%">
             <DatePicker
@@ -96,23 +65,14 @@
             ></DatePicker>
           </FormItem>
         </Col>
-        <Col span="8">
-          <FormItem label="甲方客户" style="width:100%">
-            <dictionary
-              code="plan.order.guestName"
-              v-model="orderSearchForm.guestName"
-              style="width:240px"
-            ></dictionary>
-          </FormItem>
-        </Col>
+      </Row>
+      <Row>
         <Col span="8">
           <FormItem label="项目号" style="width:100%">
             <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
           </FormItem>
         </Col>
-      </Row>
-      <Row>
-        <Col span="8">
+         <Col span="8">
           <FormItem label="批次号" style="width:100%">
             <Input v-model="orderSearchForm.batchNumber" style="width:240px" />
           </FormItem>
@@ -126,30 +86,13 @@
             ></dictionary>
           </FormItem>
         </Col>
-        <Col span="8">
-          <FormItem label="甲方任务号" style="width:100%">
-            <Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
-          </FormItem>
-        </Col>
       </Row>
       <Row>
-        <Col span="8">
+        <Col span="24">
           <FormItem label="任务节点要求" style="width:100%">
-            <Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" />
-          </FormItem>
-        </Col>
-        <Col span="8">
-          <FormItem label="甲方投产输入文件(编号)" style="width:100%">
-            <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
+            <Input v-model="orderSearchForm.taskRequire" placeholder  />
           </FormItem>
         </Col>
-        <Col span="8">
-          <FormItem label="甲方技术输入文件(编号)" style="width:100%">
-            <Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
-          </FormItem>
-        </Col>
-      </Row>
-      <Row>
         <Col span="24">
           <FormItem label="备注" style="width:100%">
             <Input v-model="orderSearchForm.remark" placeholder type="textarea" :rows="3" />
@@ -193,26 +136,10 @@ export default {
         productName: "", //产品名称
         drawnNumber: null, //图号
         taskType: null, //任务类型
-        stage: null, //阶段
-        materialId: null, //材料
         quantity: 1, //数量
-        guestName: "", //甲方客户
-        printSupply: "", //3D打印承制单位
-        functionaryOffice: "", //厂内责任机关
-        mainDepartmentId: "", //厂内责任主体部门ID
         taskRequire: "", //任务接点要求
-        putintDocmentCode: "", //甲方投产输入文件编号
-        technologyDocmentCode: "", //甲方技术输入文件编号
-        outerDrawnNumber: "", //外部图号/模型号
-        modelVersion: "", //模型版本
-        taskCode: "", //甲方任务号
-        designer: "", //甲方设计人员
-        officeFunctionary: "", //厂内机关负责人
-        mainRoutingPeople: "", //厂内主工艺人员
-        routing_Method: null, //工艺方法
-        outer_Envelope_Size: "", //包装尺寸
         demandStartDate: this.getFormatDate(nowDate), //开始时间
-        demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
+        demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
         remark: "", //备注
         projectNumber: "", //项目号
         batchNumber: "", //批次号
@@ -235,22 +162,6 @@ export default {
             type: "number"
           }
         ],
-        stage: [
-          {
-            required: true,
-            message: "请选择阶段",
-            type: "number",
-            trigger: "change"
-          }
-        ],
-        materialId: [
-          {
-            required: true,
-            message: "请选择材料",
-            type: "number",
-            trigger: "change"
-          }
-        ],
         quantity: [
           {
             required: true,
@@ -259,14 +170,6 @@ export default {
             trigger: "change"
           }
         ],
-        routing_Method: [
-          {
-            required: true,
-            message: "请选择工艺方法",
-            type: "number",
-            trigger: "change"
-          }
-        ]
       },
       disabled:false,
     };
@@ -279,7 +182,8 @@ export default {
       this.$refs.formValidate.validate(v => {
         if (v) {
           this.disabled = true;
-          Api.create(this.entity)
+          this.orderSearchForm.status=1
+          Api.mesplancreate(this.orderSearchForm)
             .then(r => {
               this.disabled = false;
               if (r.success) {
@@ -394,11 +298,11 @@ export default {
     },
     getFinishedDate(value) {
       if (value == "") {
-        this.orderSearchForm.demandFinishDate = this.getFormatDate(
+        this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(
           tomorrowDate
         );
       } else {
-        this.orderSearchForm.demandFinishDate = this.getFormatDate(value);
+        this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(value);
       }
     },
     getFormatDate(dates) {
@@ -408,7 +312,17 @@ export default {
         "-" +
         this.p(d.getMonth() + 1) +
         "-" +
-        this.p(d.getDate());
+        this.p(d.getDate())+ " 00:00:01";
+      return resDate;
+    },
+    getFormatDateEnd(dates) {
+      const d = new Date(dates);
+      const resDate =
+        d.getFullYear() +
+        "-" +
+        this.p(d.getMonth() + 1) +
+        "-" +
+        this.p(d.getDate())+ " 23:59:59";
       return resDate;
     },
     p(s) {

pages/mesPlan/api.js

 import Api from '@/plugins/request'
 export default {
-  index: `${PlanUrl}/mesplan/paged`,
+  index: `${PlanUrl}/mesplan/getpagedmesplans`,
   paged(params) {
     return Api.post(`${PlanUrl}/mesplan/paged`, params);
   },
@@ -19,4 +19,37 @@ export default {
       params: params
     });
   },
+  //----new 接口------
+  //批量删除
+  batchdelete(params) {
+    return Api.post(`${PlanUrl}/mesplan/batchdelete`, params);
+  },
+  //分页列表
+  getpagedmesplans(params) {
+    return Api.post(`${PlanUrl}/mesplan/getpagedmesplans`, params);
+  },
+  //创建订单
+  mesplancreate(params) {
+    return Api.post(`${PlanUrl}/mesplan/mesplancreate`, params);
+  },
+  //修改订单
+  mesorderupdate(params) {
+    return Api.post(`${PlanUrl}/mesplan/mesorderupdate`, params);
+  },
+  //订单派发+生成产品序号
+  mesorderdistribute(params) {
+    return Api.post(`${PlanUrl}/mesplan/mesorderdistribute`, params);
+  },
+  //删除父订单+子订单
+  mesorderdelete(params) {
+    return Api.post(`${PlanUrl}/mesplan/mesorderdelete`, params);
+  },
+  //所有最后一级子订单删除前检查
+  sondeletecheck(params) {
+    return Api.post(`${PlanUrl}/mesplan/sondeletecheck`, params);
+  },
+  //订单分解--保存子订单，除设置值外其他字段同父订单
+  mesorderdivide(params) {
+    return Api.post(`${PlanUrl}/mesplan/mesorderdivide`, params);
+  },
 }

pages/mesPlan/detail.vue

@@ -16,8 +16,8 @@
       <Filed :span="12" :name="l('urgencyLevel')">
         <state code="plan.order.urgencyLevel" :value="entity.urgencyLevel" type="text"></state>
       </Filed>
-      <Filed :span="12" :name="l('demandStartDate')">{{entity.demandStartDate}}</Filed>
-      <Filed :span="12" :name="l('demandFinishDate')">{{entity.demandFinishDate}}</Filed>
+      <Filed :span="12" :name="l('demandStartDate')"><DTSpan type="date" v-model="entity.demandStartDate"></DTSpan></Filed>
+      <Filed :span="12" :name="l('demandFinishDate')"><DTSpan type="date" v-model="entity.demandFinishDate"></DTSpan></Filed>
       <Filed :span="12" :name="l('taskRequire')">{{entity.taskRequire}}</Filed>
       <Filed :span="24" :name="l('remark')">{{entity.remark}}</Filed>
     </Row>

pages/mesPlan/edit.vue

 <template>
   <Form :model="orderSearchForm" :label-width="95" :rules="ruleValidate" ref="formValidate">
     <Row>
-      <!-- <Col span="24">
-        <FormItem label="订单编号" style="width:100%">
-          {{this.orderSearchForm.mesCode}}
-        </FormItem>
-      </Col>-->
+      <Col span="8">
+        <FormItem label="订单编号" style="width:100%">{{this.orderSearchForm.mesCode}}</FormItem>
+      </Col>
       <Col span="8">
         <FormItem :label="l('productName')" style="width:100%" prop="productId">
           <Select
@@ -30,6 +28,8 @@
           <Input v-model="orderSearchForm.productName" style="width:240px" v-show="false" />
         </FormItem>
       </Col>
+    </Row>
+    <Row>
       <Col span="8">
         <FormItem :label="l('taskType')" style="width:100%" prop="taskType">
           <dictionary
@@ -39,43 +39,11 @@
           ></dictionary>
         </FormItem>
       </Col>
-    </Row>
-    <Row>
-      <Col span="8">
-        <FormItem :label="l('stage')" style="width:100%" prop="stage">
-          <dictionary code="plan.order.stage" v-model="orderSearchForm.stage" style="width:240px"></dictionary>
-        </FormItem>
-      </Col>
-      <Col span="8">
-        <FormItem :label="l('materialId')" style="width:100%" prop="materialId">
-          <dictionary
-            code="plan.order.material"
-            v-model="orderSearchForm.materialId"
-            style="width:240px"
-          ></dictionary>
-        </FormItem>
-      </Col>
       <Col span="8">
         <FormItem :label="l('quantity')" style="width:100%" prop="quantity">
           <InputNumber :min="0" v-model="orderSearchForm.quantity" style="width:240px"></InputNumber>
         </FormItem>
       </Col>
-    </Row>
-    <Row>
-      <Col span="8">
-        <FormItem :label="l('routing_Method')" style="width:100%" prop="routing_Method">
-          <dictionary
-            code="plan.order.routingMethod"
-            v-model="orderSearchForm.routing_Method"
-            style="width:240px"
-          ></dictionary>
-        </FormItem>
-      </Col>
-      <Col span="8">
-        <FormItem :label="l('outer_Envelope_Size')" style="width:100%">
-          <Input v-model="orderSearchForm.outer_Envelope_Size" style="width:240px"></Input>
-        </FormItem>
-      </Col>
       <Col span="8">
         <FormItem :label="l('demandStartDate')" style="width:100%">
           <DatePicker
@@ -100,27 +68,19 @@
           ></DatePicker>
         </FormItem>
       </Col>
-      <Col span="8">
-        <FormItem :label="l('guestName')" style="width:100%">
-          <dictionary
-            code="plan.order.guestName"
-            v-model="orderSearchForm.guestName"
-            style="width:240px"
-          ></dictionary>
-        </FormItem>
-      </Col>
+
       <Col span="8">
         <FormItem :label="l('projectNumber')" style="width:100%">
           <Input v-model="orderSearchForm.projectNumber" style="width:240px" />
         </FormItem>
       </Col>
-    </Row>
-    <Row>
       <Col span="8">
         <FormItem :label="l('batchNumber')" label="批次号" style="width:100%">
           <Input v-model="orderSearchForm.batchNumber" style="width:240px" />
         </FormItem>
       </Col>
+    </Row>
+    <Row>
       <Col span="8">
         <FormItem :label="l('urgencyLevel')" style="width:100%">
           <dictionary
@@ -130,26 +90,9 @@
           ></dictionary>
         </FormItem>
       </Col>
-      <Col span="8">
-        <FormItem :label="l('taskCode')" style="width:100%">
-          <Input v-model="orderSearchForm.taskCode" placeholder style="width:240px" />
-        </FormItem>
-      </Col>
-    </Row>
-    <Row>
-      <Col span="8">
+      <Col span="24">
         <FormItem :label="l('taskRequire')" style="width:100%">
-          <Input v-model="orderSearchForm.taskRequire" placeholder style="width:240px" />
-        </FormItem>
-      </Col>
-      <Col span="8">
-        <FormItem :label="l('putintDocmentCode')" style="width:100%">
-          <Input v-model="orderSearchForm.putintDocmentCode" placeholder style="width:240px" />
-        </FormItem>
-      </Col>
-      <Col span="8">
-        <FormItem :label="l('technologyDocmentCode')" style="width:100%">
-          <Input v-model="orderSearchForm.technologyDocmentCode" placeholder style="width:240px" />
+          <Input v-model="orderSearchForm.taskRequire" placeholder />
         </FormItem>
       </Col>
     </Row>
@@ -177,11 +120,34 @@ export default {
       disabled: false,
       orderSearchForm: {},
       ruleValidate: {
-        name: [{ required: true, message: "必填", trigger: "blur" }]
+       productId: [
+          {
+            required: true,
+            message: "请选择产品名称",
+            type: "number",
+            trigger: "change"
+          }
+        ],
+        taskType: [
+          {
+            required: true,
+            message: "请选择任务类型",
+            trigger: "change",
+            type: "number"
+          }
+        ],
+        quantity: [
+          {
+            required: true,
+            message: "请输入数量",
+            type: "number",
+            trigger: "change"
+          }
+        ],
       },
-      placeholdeinfo:'',
-      list:[],
-      data1:[],
+      placeholdeinfo: "",
+      list: [],
+      data1: []
     };
   },
   props: {
@@ -192,8 +158,8 @@ export default {
       }
     }
   },
-  mounted(){
-    this.loadTree()
+  mounted() {
+    this.loadTree();
   },
   methods: {
     load(v) {
@@ -203,10 +169,11 @@ export default {
       });
     },
     handleSubmit() {
-      this.$refs.form.validate(v => {
+      this.$refs.formValidate.validate(v => {
         if (v) {
           this.disabled = true;
-          Api.update(this.orderSearchForm)
+          this.orderSearchForm.status=1
+          Api.mesorderupdate(this.orderSearchForm)
             .then(r => {
               this.disabled = false;
               if (r.success) {
@@ -252,27 +219,14 @@ export default {
         productName: "", //产品名称
         drawnNumber: null, //图号
         taskType: null, //任务类型
-        stage: null, //阶段
-        materialId: null, //材料
         quantity: 1, //数量
-        guestName: "", //甲方客户
-        printSupply: "", //3D打印承制单位
-        functionaryOffice: "", //厂内责任机关
-        mainDepartmentId: "", //厂内责任主体部门ID
         taskRequire: "", //任务接点要求
-        putintDocmentCode: "", //甲方投产输入文件编号
-        technologyDocmentCode: "", //甲方技术输入文件编号
-        outerDrawnNumber: "", //外部图号/模型号
-        modelVersion: "", //模型版本
-        taskCode: "", //甲方任务号
-        designer: "", //甲方设计人员
-        officeFunctionary: "", //厂内机关负责人
-        mainRoutingPeople: "", //厂内主工艺人员
-        routing_Method: null, //工艺方法
-        outer_Envelope_Size: "", //包装尺寸
         demandStartDate: this.getFormatDate(nowDate), //开始时间
-        demandFinishDate: this.getFormatDate(tomorrowDate), //完成时间
-        remark: "" //备注
+        demandFinishDate: this.getFormatDateEnd(tomorrowDate), //完成时间
+        remark: "", //备注
+        projectNumber: "", //项目号
+        batchNumber: "", //批次号
+        urgencyLevel: null //紧急程度
       };
     },
     loadTree() {
@@ -289,7 +243,6 @@ export default {
           this.$Message.error("加载产品树失败!");
         }
       });
-      
     },
     renderContent(h, { root, node, data }) {
       //渲染树的样式
@@ -321,11 +274,11 @@ export default {
     },
     getFinishedDate(value) {
       if (value == "") {
-        this.orderSearchForm.demandFinishDate = this.getFormatDate(
+        this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(
           tomorrowDate
         );
       } else {
-        this.orderSearchForm.demandFinishDate = this.getFormatDate(value);
+        this.orderSearchForm.demandFinishDate = this.getFormatDateEnd(value);
       }
     },
     getFormatDate(dates) {
@@ -335,7 +288,19 @@ export default {
         "-" +
         this.p(d.getMonth() + 1) +
         "-" +
-        this.p(d.getDate());
+        this.p(d.getDate()) +
+        " 00:00:01";
+      return resDate;
+    },
+    getFormatDateEnd(dates) {
+      const d = new Date(dates);
+      const resDate =
+        d.getFullYear() +
+        "-" +
+        this.p(d.getMonth() + 1) +
+        "-" +
+        this.p(d.getDate()) +
+        " 23:59:59";
       return resDate;
     },
     p(s) {
@@ -347,7 +312,7 @@ export default {
     row(v) {
       if (v != null) {
         this.orderSearchForm = this.$u.clone(this.row);
-        this.placeholdeinfo=this.orderSearchForm.productName
+        this.placeholdeinfo = this.orderSearchForm.productName;
       }
     }
   }

pages/mesPlan/send.vue

 <template>
-  <div style="width:100%;margin:0 auto" >
-    <Detail  ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
+  <div style="width:100%;margin:0 auto">
+    <Detail ref="detailRow" :row="row1" v-show="dataList.length==1"></Detail>
     <Table
       border
       :columns="columns1"
@@ -20,10 +20,7 @@
         <Row>
           <Col span="6">
             <FormItem label="生产准备" style="width:100%" prop="ProductingPreparationPeople">
-              <WorkShopSelect
-                ref="userSelected"
-                v-model="orderForm.ProductingPreparationPeople"
-              />
+              <WorkShopSelect ref="userSelected" v-model="orderForm.ProductingPreparationPeople" />
             </FormItem>
           </Col>
           <Col span="6">
@@ -38,10 +35,7 @@
           </Col>
           <Col span="6">
             <FormItem label="订单报价人员" style="width:100%" prop="QuotationPeople">
-              <UserSelect
-                ref="userSelected"
-                v-model="orderForm.QuotationPeople"
-              />
+              <UserSelect ref="userSelected" v-model="orderForm.QuotationPeople" />
             </FormItem>
           </Col>
           <Col span="6">
@@ -71,21 +65,9 @@ export default {
   data() {
     return {
       divHeight: "400px",
-      osrOneList: false, //一条数据显示详细
-      osrMoreList: false, //多条数据只显示列表
-      info: {
-        status: true,
-        orderInfo: []
-      },
       roleTitle: "工艺员",
       orderForm: {
-        DistributeMainRouting: null, //主工艺人员
-        MainRoutingFinishDate: "", //主工艺人员完成时间
-        MajorRoutingPeople: null, //专业工艺人员
-        MajorRoutingFinishDate: "", //专业工艺人员完成时间
-        CheckUpPeople: 1, //校对人员 暂时不用
-        CheckUpFinishDate: "2019-12-19", //校对人员完成时间
-        ProductingPreparationPeople: null, //生产准备人员
+        ProductingPreparationPeople: null, //生产准备
         ProductingPreparationFinishDate: "", //生产准备完成时间
         QuotationPeople: null, //订单报价人员
         QuotationFinishDate: "" //订单报价完成时间
@@ -128,7 +110,7 @@ export default {
         }
       ],
       dataList: [],
-      row1:{},
+      row1: {},
       dataListRetrun: [], //确定后返回数据
 
       ruleValidate: {
@@ -164,8 +146,8 @@ export default {
         ]
       },
       rowList: [],
-      row1:{},
-      tbHeight:0,
+      row1: {},
+      tbHeight: 0
     };
   },
   props: {
@@ -177,35 +159,14 @@ export default {
     }
   },
   methods: {
-    returnDataList() {
-      this.dataListRetrun = [];
-      this.dataList.forEach(item => {
-        let objStr = {};
-        objStr.id = item.id;
-        objStr.mesCode = item.mesCode;
-        objStr.DistributeMainRouting = this.orderForm.DistributeMainRouting;
-        objStr.MainRoutingFinishDate = this.orderForm.MainRoutingFinishDate;
-        objStr.MajorRoutingPeople = this.orderForm.MajorRoutingPeople;
-        objStr.MajorRoutingFinishDate = this.orderForm.MajorRoutingFinishDate;
-        objStr.CheckUpPeople = this.orderForm.CheckUpPeople;
-        objStr.CheckUpFinishDate = this.orderForm.CheckUpFinishDate;
-        objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
-        objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
-        objStr.QuotationPeople = this.orderForm.QuotationPeople;
-        objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
-        this.dataListRetrun.push(objStr);
-      });
+    returnData() {
+      let objStr = {};
+      objStr.ProductingPreparationPeople = this.orderForm.ProductingPreparationPeople;
+      objStr.ProductingPreparationFinishDate = this.orderForm.ProductingPreparationFinishDate;
+      objStr.QuotationPeople = this.orderForm.QuotationPeople;
+      objStr.QuotationFinishDate = this.orderForm.QuotationFinishDate;
       //返回审批数据
-      return this.dataListRetrun;
-    },
-    getTimeMainRFD(value) {
-      this.orderForm.MainRoutingFinishDate = value;
-    },
-    getTimeMajorRFD(value) {
-      this.orderForm.MajorRoutingFinishDate = value;
-    },
-    getTimeCheckFD(value) {
-      this.orderForm.CheckUpFinishDate = value;
+      return objStr;
     },
     getTimeProductPFD(value) {
       this.orderForm.ProductingPreparationFinishDate = value;
@@ -216,7 +177,7 @@ export default {
   },
   created() {
     //var theight = window.innerHeight - 400 + "px";
-   // this.divHeight = theight;
+    // this.divHeight = theight;
   },
   mounted() {
     // window.onresize = () => {
@@ -231,11 +192,10 @@ export default {
     row(v) {
       if (v != []) {
         this.dataList = this.$u.clone(this.row);
-        this.row1=this.dataList[0]
-        this.tbHeight=0
-        if(this.dataList.length>3)
-        {
-          this.tbHeight=200
+        this.row1 = this.dataList[0];
+        this.tbHeight = 0;
+        if (this.dataList.length > 3) {
+          this.tbHeight = 200;
         }
       }
     }

pages/mesPlan/split.vue

@@ -90,25 +90,8 @@ export default {
         mesCode: "", //订单编号
         productName: "", //产品名称
         drawingNo: "", //图号
-        producePic: "", //产品图号
-        stage: "", //阶段
         orderCat: "", //任务类型
         quantity: "", //数量
-        materail: "", //材料
-        printDepartment: "", //3D打印承制单位
-        ownerGust: "", //甲方客户
-        mainDept: "", //厂内责任主体部门
-        inhouseOffice: "", //厂内责任机关
-        nodeRequire: "", //任务接点要求
-        inputDate: "", //任务输入日期
-        techniqueInputDoc: "", //甲方技术输入文件
-        productInputDoc: "", //甲方投产输入文件
-        modalVersion: "", //模型版本
-        drawNumber: "", //模型号
-        ownerDesigner: "", //甲方设计人员
-        missionCode: "", //甲方任务号
-        mainRoutingPeople: "", //厂内主工艺人员
-        inhousePrincipal: "", //厂内机关负责人
         remark: "" //备注
       },
       orderForm: {

pages/processDesign/Process/detailfiles.vue

@@ -12,12 +12,14 @@
       :on-exceeded-size="onExceededSize"
       :on-format-error="onFormatError"
       :action="postUrl"
+      :on-progress="onProgress"
     >
       <div style="padding: 20px 0;text-align:center">
         <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
         <p>将文件拖到此处，或点击上传</p>
       </div>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
     <Tag
       v-for="(item,index) in nameList"
       :key="index"
@@ -62,7 +64,9 @@ export default {
         'jpg',
         'gif'
       ],
-      postUrl: ''
+      postUrl: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -72,7 +76,13 @@ export default {
 
       this.intFiles()
     },
+    onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -82,6 +92,11 @@ export default {
         objImag.id = file.response.data.id
         filesList.push(objImag)
         this.nameList = this.nameList.concat(filesList)
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
 
         var url = `${designUrl}/routingfile/createorupdate`
         var dataValidate = {

pages/processDesign/Process/processfile.vue

@@ -12,12 +12,14 @@
       :on-exceeded-size="onExceededSize"
       :on-format-error="onFormatError"
       :action="postUrl"
+      :on-progress="onProgress"
     >
       <div style="padding: 20px 0;text-align:center">
         <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
         <p>将文件拖到此处，或点击上传</p>
       </div>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
     <Tag
       v-for="(item,index) in nameList"
       :key="index"
@@ -53,7 +55,9 @@ export default {
         'jpg',
         'gif'
       ],
-      postUrl: ''
+      postUrl: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -66,8 +70,13 @@ export default {
     
   },
   methods: {
-  
+  onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -77,6 +86,11 @@ export default {
         objImag.id = file.response.data.id
         filesList.push(objImag)
         this.nameList = this.nameList.concat(filesList)
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
       } else {
         this.$Message.error('上传失败，请重新上传!')
       }

pages/processManage/Process/detailfiles.vue

@@ -12,12 +12,14 @@
       :on-exceeded-size="onExceededSize"
       :on-format-error="onFormatError"
       :action="postUrl"
+      :on-progress="onProgress"
     >
       <div style="padding: 20px 0;text-align:center">
         <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
         <p>将文件拖到此处，或点击上传</p>
       </div>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
     <Tag
       v-for="(item,index) in nameList"
       :key="index"
@@ -62,7 +64,9 @@ export default {
         'jpg',
         'gif'
       ],
-      postUrl: ''
+      postUrl: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -72,7 +76,13 @@ export default {
 
       this.intFiles()
     },
+    onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -82,6 +92,11 @@ export default {
         objImag.id = file.response.data.id
         filesList.push(objImag)
         this.nameList = this.nameList.concat(filesList)
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
 
         var url = `${designUrl}/routingfile/createorupdate`
         var dataValidate = {

pages/processManage/Process/processfile.vue

@@ -12,12 +12,14 @@
       :on-exceeded-size="onExceededSize"
       :on-format-error="onFormatError"
       :action="postUrl"
+      :on-progress="onProgress"
     >
       <div style="padding: 20px 0;text-align:center">
         <Icon type="ios-cloud-upload" size="52" style="color: #3399ff"></Icon>
         <p>将文件拖到此处，或点击上传</p>
       </div>
     </Upload>
+    <Progress :percent="per" :stroke-width="5" v-show="vshowPro"/>
     <Tag
       v-for="(item,index) in nameList"
       :key="index"
@@ -53,7 +55,9 @@ export default {
         'jpg',
         'gif'
       ],
-      postUrl: ''
+      postUrl: '',
+      per: 0,
+      vshowPro: false
     }
   },
   created() {},
@@ -66,8 +70,13 @@ export default {
     
   },
   methods: {
-  
+  onProgress(event, file, fileList) {
+      this.per = 0
+      this.vshowPro = true
+    },
     uploadSuccess(response, file, fileList) {
+      this.per = 60
+      this.vshowPro = true
       const hbaseFileList = []
       const filesList = []
       if (file.response.status == 0) {
@@ -77,6 +86,11 @@ export default {
         objImag.id = file.response.data.id
         filesList.push(objImag)
         this.nameList = this.nameList.concat(filesList)
+        this.per = 100
+        setTimeout(() => {
+          this.per = 0
+          this.vshowPro = false
+        }, 2000)
       } else {
         this.$Message.error('上传失败，请重新上传!')
       }