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

pages/technology/add.vue

@@ -39,7 +39,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('author')" prop="author">
-          <Input v-model="entity.author"></Input>
+          <UserSelect v-model="entity.author"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12">

pages/technology/details.vue

@@ -44,7 +44,7 @@
       <div class="details_body">
                 <Menu mode="horizontal" theme="light" active-name="0">
                     <MenuItem name="0" :to="'/technology/details?id='+headerId">工序</MenuItem>
-                    <MenuItem name="1" :to="'/technology/details/routingStep?id='+headerId">工步</MenuItem>
+                    <!-- <MenuItem name="1" :to="'/technology/details/routingStep?id='+headerId">工步</MenuItem> -->
                     <MenuItem name="2" :to="'/technology/details/routingqccard?id='+headerId">质控卡</MenuItem>
                     <MenuItem name="3" :to="'/technology/details/routingsupporting?id='+headerId">工艺BOM</MenuItem>
                     <!-- <MenuItem name="4" to="/technology/details/setup/setupDetails">生产准备</MenuItem> -->

pages/technology/details/routingStep/detail.vue

@@ -3,10 +3,16 @@
     <Row>
       <Filed :span="12" :name="l('stepSeq')">{{entity.stepSeq}}</Filed>
       <Filed :span="12" :name="l('name')">{{entity.name}}</Filed>
-      <Filed :span="12" :name="l('status')">{{entity.status}}</Filed>
+      <Filed :span="12" :name="l('status')">
+      <state
+          code="Process.state"
+          :value="entity.status+''"
+          type="text"
+        ></state>
+      </Filed>
       <Filed :span="24" :name="l('stepContent')"><div v-html="entity.stepContent" class="html"></div></Filed>
        <Filed :span="12" :name="l('creationTime')">{{entity.creationTime}}</Filed>
-      <Filed :span="12" :name="l('creatorUserId')">{{entity.creatorUserId}}</Filed>
+      <Filed :span="12" :name="l('creatorUserId')"><User :value="entity.creatorUserId"></User></Filed>
     </Row>
   </div>
 </template>

pages/technology/details/routingqccard/detail.vue

@@ -32,7 +32,13 @@
 
       <Filed :span="12" :name="l('checkParams')">{{entity.checkParams}}</Filed>
       <Filed :span="12" :name="l('measurementUnit')">{{entity.measurementUnit}}</Filed>
-      <Filed :span="12" :name="l('isphotograph')">{{entity.isphotograph}}</Filed>
+      <Filed :span="12" :name="l('isphotograph')">
+       <state
+          code="Process.state"
+          :value="entity.isphotograph+''"
+          type="text"
+        ></state>
+      </Filed>
       <Filed :span="12" :name="l('status')">
         <state code="Process.state" :value="entity.status+''" type="text"></state>
       </Filed>

pages/technology/edit.vue

@@ -39,7 +39,7 @@
       </Col>
       <Col :span="12">
         <FormItem :label="l('author')" prop="author">
-          <Input v-model="entity.author"></Input>
+          <UserSelect v-model="entity.author"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12">

pages/technology/index.vue

@@ -84,8 +84,8 @@
             <span class="grayTitle">{{titleObj.routingType}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
             {{l('version')}}：
             <span class="grayTitle">{{titleObj.version}}</span>&nbsp;&nbsp;&nbsp;&nbsp;
-            {{l('departmentId')}}：
-            <span class="grayTitle">{{titleObj.departmentId}}</span>
+            <!-- {{l('departmentId')}}：
+            <span class="grayTitle">{{titleObj.departmentId}}</span> -->
           </div>
         </div>
         <div class="fg">