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

assets/css/base.less

@@ -54,6 +54,9 @@ div::-webkit-scrollbar{
 .fc-a{
     justify-content: space-around;
 }
+.fc-ev{
+    justify-content: space-evenly;
+}
 .fd{
     flex-direction: column;
 }

i18n/locale/zh-CN.js

@@ -1438,5 +1438,16 @@ export default {
     productUrl:'产品图像url',
     productUrlList:'产品图象列表',
          
+  },
+  order_list:{
+    mesCode:'订单编号',
+    status:'工单状态',
+    productName:'产品名称',
+    drawnNumber:'图号',
+    quantity:'生产数量',
+    beginTime:'开始时间',
+    endTime:'结束时间',
+    planEndTime:'计划结束时间',
+    action:'操作'
   }
 }

pages/crm/customer/index.vue

@@ -5,7 +5,7 @@
         <Form ref="formInline" :model="easySearch" inline>
           <FormItem prop="keys">
             <Input
-              placeholder="请输入关键字客户名称/客户简称/邮政地址/负责人/办公电话/手机/客户类型/客户区域/备注/客户编码/行业"
+              placeholder="请输入关键字客户名称/办公电话"
               v-model="easySearch.keys.value"
               search
               enter-button
@@ -55,7 +55,7 @@ export default {
       easySearch: {
         keys: {
           op:
-            'name,abbre,address,principal,telephone,mobile,type,area,notes,code,trade',
+            'name,telephone',
           value: null
         }
       },

pages/produce/execute/execute.less

@@ -443,6 +443,12 @@
             width: 460px;
         }
     }
+    .futer{
+        width: 100%;
+        height: 60px;
+        position: absolute;
+        bottom: 1px;
+    }
 }
 
 .tech_box{

pages/produce/execute/judgment/index.vue

@@ -46,15 +46,15 @@
             <div class="fei_right">
                 <p>问题原因：<Select style="width:80%">
                             <!-- <Option value="" class="option-text">请选择</Option> placeholder="选择问题原因" -->
-                            <Option v-for="item in outerCodeList"   :value="item" :key="item">{{ item }}</Option>
+                            <Option v-for="item in problemList" :value="item.number" :key="item.index">{{ item.number }}</Option>
                         </Select></p>
                 <p>责任归属：<Select style="width:80%">
                             <!-- <Option value="" class="option-text">请选择</Option> placeholder="选择责任人" -->
-                            <Option v-for="item in outerCodeList"   :value="item" :key="item">{{ item }}</Option>
+                            <Option v-for="item in blameList" :value="item.user" :key="item.index">{{ item.user }}</Option>
                         </Select></p>
             </div>
         </div>
-        <div class="star flex fc-m" >
+        <div class="futer flex fc-ev" >
             <Button class="button" size='large' type="primary"> 提交</Button>
             <Button class="button" size='large' type="primary"> 取消</Button>
         </div>
@@ -192,7 +192,16 @@ export default {
                     checked:false,
                 },
             ],
-            outerCodeList:[],
+            problemList:[
+                { number:"问题描述01" , },
+                { number:"问题描述02" , },
+                { number:"问题描述03" , },
+            ],
+            blameList:[
+                { user:"责任人01" , },
+                { user:"责任人02" , },
+                { user:"责任人03" , },
+            ],
         }
     },
     created() {