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

assets/css/base.less

@@ -992,8 +992,15 @@ textarea::-webkit-input-placeholder {
 .tableCommon tr td .ivu-table-cell {
   padding: 0 2px;
 }
-
-
+.cellblock{
+  display:block;
+  line-height:30px;
+  padding:5px 10px;
+  background:#f5f6fa;
+  border-bottom:solid 1px #ccc;
+  border-left:solid 1px #ccc;
+  border-right:solid 1px #ccc
+}
 .cellInfoTitle {
   padding: 0 10px;
   text-align: right;

pages/mesPlan/index.vue

@@ -39,7 +39,7 @@
                 <Search />
             </template>
             <template slot="buttons">
-                <Button type="primary" @click="addModal=true">创建</Button>
+                <Button type="primary" @click="addModal=true">新增</Button>
             </template>
             <template slot="batch">
                 <Button type="primary" class="mr10 ml10" @click="openSendViewModal" v-if="this.wfstatu==1">订单送审</Button>

pages/mesPlan/split.vue

@@ -33,7 +33,7 @@
             </Col>
             <Col span="12">
             <FormItem label="分解数量" style="width:100%" prop="splitQuantity">
-                <InputNumber :min="0" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
+                <InputNumber :min="2" :max="orderForm.quantity" v-model="orderForm.splitQuantity" style="width:180px"></InputNumber>
                 <Button type="primary" @click="addSplitOrder" v-noClick>确定</Button>
             </FormItem>
             </Col>
@@ -41,13 +41,16 @@
     </Form>
     <Table :loading="loading" border :columns="columns1" :data="dataList" class="tableCommon">
         <template slot-scope="{ row, index }" slot="slotPlanQ">
-            <Input type="text" v-model="row.quantity" @on-change="inputOrderCat(row,index)" />
+            <InputNumber :min="0" :max="amountMax" v-model="row.quantity" @on-change="inputOrderCat(row,index)" @on-focus="inputFocus(row,index)" />
         </template>
         <template slot-scope="{ row, index }" slot="slotTime">
             <DatePicker v-model="row.demandDate" type="daterange" placeholder="请选择日期" style="width:240px" :transfer="true" :options="optionsDate" @on-change="inputOrderCat(row,index)"></DatePicker>
         </template>
     </Table>
-    <p v-show="false">剩余数量：{{amount}}</p>
+    <div class="cellblock">
+        <p>剩余产品数量：{{amount}}</p>
+    </div>
+
 </div>
 </template>
 
@@ -134,6 +137,7 @@ export default {
                 }]
             },
             amount: 0,
+            amountMax: this.amount,
         };
     },
     props: {
@@ -217,10 +221,9 @@ export default {
                 splitAmount = Number(splitAmount) + Number(el.quantity)
             })
             this.amount = this.orderForm.quantity - splitAmount
-            // setTimeout(() => {
-            //     this.amount = this.orderForm.quantity - splitAmount
-            // }, 1000);
-
+        },
+        inputFocus(row, index) {
+            this.amountMax = this.amount + row.quantity
         },
         getFormatDate(dates) {
             const d = new Date(dates);

pages/produce/execute/taskTime/index.vue

@@ -7,7 +7,10 @@
         <span class="">{{ topInfoShow.name }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 派工数量:
         <span class="">{{ topInfoShow.count }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 绩效单件：
         <span class="">{{ topInfoShow.performanceHours }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 绩效准结：
-        <span class="">{{ topInfoShow.performanceWorkingHours }}</span>
+        <span class="">{{ topInfoShow.performanceWorkingHours }}</span>&nbsp;&nbsp;&nbsp;&nbsp; 工时提交状态：
+        <span class="">
+            <state code="orderList.workHourStatus" ref="state" :value=" topInfoShow.subWorkHourStatus" type="text"></state>
+        </span>
     </div>
     <div class="gs_top">
         <div class="gs_top_box total_time">

pages/project/plan/index.vue

@@ -31,13 +31,15 @@
             <DropdownMenu slot="list">
               <DropdownItem name="saveTemplate">存为模版</DropdownItem>
               <DropdownItem name="useTemplate">导入模版</DropdownItem>
-              <DropdownItem name="down">
+              <DropdownItem name="down"   disabled>
                 <Icon
                   type="md-cloud-download"
                   class="mr10"
+                
                 />导出Excel</DropdownItem
               >
               <DropdownItem name="importExcel"
+                disabled
                 ><Icon
                   type="md-cloud-upload"
                   class="mr10"