routinghcorder

pages/technology/details/routinghcorder/add.vue

     <template>
-  <Form ref="form" :model="entity" :rules="rules" :label-width="90">
+  <Form ref="form" :model="entity" :rules="rules" :label-width="110">
     <Row>
       <Col :span="12">
         <FormItem :label="l('routingHeaderId')" prop="routingHeaderId">

pages/technology/details/routinghcorder/index.vue

@@ -94,7 +94,8 @@ export default {
           key: "checkPerson",
           title: this.l("checkPerson"),
           align: "left",
-          high: true
+          high: true,
+          type:'user'
         },
         {
           key: "quantity",
@@ -102,36 +103,42 @@ export default {
           align: "left",
           high: true
         },
-        { key: "status", title: this.l("status"), align: "left", high: true },
+        {
+          key: "status",
+          title: this.l("status"),
+          align: "left",
+          high: true,
+          code: "unProduct.repairstatus"
+        },
         {
           key: "creationTime",
           title: this.l("creationTime"),
           hide: true,
           align: "left",
-          hide:true,
+          hide: true
         },
         {
           key: "creatorUserId",
           title: this.l("creatorUserId"),
           hide: true,
           align: "left",
-          hide:true,
-          type:'user',
+          hide: true,
+          type: "user"
         },
         {
           key: "lastModificationTime",
           title: this.l("lastModificationTime"),
           hide: true,
           align: "left",
-          hide:true,
+          hide: true
         },
         {
           key: "lastModifierUserId",
           title: this.l("lastModifierUserId"),
           hide: true,
           align: "left",
-          hide:true,
-          type:'user',
+          hide: true,
+          type: "user"
         },
         {
           title: "操作",

pages/technology/details/routinghcorder/search.vue

 <template>
-  <Form ref="form" :model="condition" :label-width="110">
+  <Form ref="form" :model="condition" :label-width="120">
     <Row>
       <Col :span="12" v-if="condition.id.show">
         <FormItem :label="l('id')" prop="id">
@@ -11,24 +11,26 @@
           <Input v-model="condition.routingHeaderId.value"></Input>
         </FormItem>
       </Col>
-      <Col :span="12" v-if="condition.classId.show">
-        <FormItem :label="l('classId')" prop="classId">
-          <Input v-model="condition.classId.value"></Input>
+      <Col :span="12" v-if="condition.changeorderCode.show">
+        <FormItem :label="l('changeorderCode')" prop="changeorderCode">
+          <Input v-model="condition.changeorderCode.value"></Input>
         </FormItem>
       </Col>
-      <Col :span="12" v-if="condition.proposeUserId.show">
-        <FormItem :label="l('proposeUserId')" prop="proposeUserId">
-          <Input v-model="condition.proposeUserId.value"></Input>
+      <Col :span="12" v-if="condition.printData.show">
+        <FormItem :label="l('printData')" prop="printData">
+          <DatePicker type="daterange" v-model="condition.printData.value"></DatePicker>
         </FormItem>
       </Col>
-      <Col :span="12" v-if="condition.proposeUserName.show">
-        <FormItem :label="l('proposeUserName')" prop="proposeUserName">
-          <Input v-model="condition.proposeUserName.value"></Input>
+
+      <Col :span="12" v-if="condition.classId.show">
+        <FormItem :label="l('classId')" prop="classId">
+          <Input v-model="condition.classId.value"></Input>
         </FormItem>
       </Col>
+
       <Col :span="12" v-if="condition.departmentId.show">
-        <FormItem :label="l('departmentId')" prop="departmentId">
-          <Input v-model="condition.departmentId.value"></Input>
+        <FormItem :label="l('departmentName')" prop="departmentId">
+           <departmentSelect v-model="condition.departmentId.value"></departmentSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.departmentName.show">
@@ -36,6 +38,16 @@
           <Input v-model="condition.departmentName.value"></Input>
         </FormItem>
       </Col>
+      <Col :span="12" v-if="condition.proposeUserId.show">
+        <FormItem :label="l('proposeUserName')" prop="proposeUserId">
+          <UserSelect v-model="condition.proposeUserId.value"></UserSelect>
+        </FormItem>
+      </Col>
+      <Col :span="12" v-if="condition.proposeUserName.show">
+        <FormItem :label="l('proposeUserName')" prop="proposeUserName">
+          <Input v-model="condition.proposeUserName.value"></Input>
+        </FormItem>
+      </Col>
       <Col :span="12" v-if="condition.technicalName.show">
         <FormItem :label="l('technicalName')" prop="technicalName">
           <Input v-model="condition.technicalName.value"></Input>
@@ -62,13 +74,13 @@
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.executiveBranchId.show">
-        <FormItem :label="l('executiveBranchId')" prop="executiveBranchId">
-          <Input v-model="condition.executiveBranchId.value"></Input>
+        <FormItem :label="l('executiveBranch')" prop="executiveBranchId">
+          <departmentSelect v-model="condition.executiveBranchId.value"></departmentSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.handlingOpinionsId.show">
-        <FormItem :label="l('handlingOpinionsId')" prop="handlingOpinionsId">
-          <Input v-model="condition.handlingOpinionsId.value"></Input>
+        <FormItem :label="l('handlingOpinions')" prop="handlingOpinionsId">
+          <Dictionary code="Process.Routing.opinion" v-model="condition.handlingOpinionsId.value" ></Dictionary>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.handlingOpinions.show">
@@ -83,12 +95,12 @@
       </Col>
       <Col :span="12" v-if="condition.checkPerson.show">
         <FormItem :label="l('checkPerson')" prop="checkPerson">
-          <Input v-model="condition.checkPerson.value"></Input>
+          <UserSelect v-model="condition.checkPerson.value"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.approvalPerson.show">
         <FormItem :label="l('approvalPerson')" prop="approvalPerson">
-          <Input v-model="condition.approvalPerson.value"></Input>
+          <UserSelect v-model="condition.approvalPerson.value"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.status.show">
@@ -96,9 +108,11 @@
           <Input v-model="condition.status.value"></Input>
         </FormItem>
       </Col>
-      <Col :span="24" v-if="condition.note.show">
-        <FormItem :label="l('note')" prop="note">
-          <Input v-model="condition.note.value"></Input>
+    </Row>
+    <Row>
+      <Col :span="12" v-if="condition.creatorUserId.show">
+        <FormItem :label="$t('creatorUserId')" prop="creatorUserId">
+          <UserSelect v-model="condition.creatorUserId.value"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.creationTime.show">
@@ -106,9 +120,9 @@
           <DatePicker type="daterange" v-model="condition.creationTime.value"></DatePicker>
         </FormItem>
       </Col>
-      <Col :span="12" v-if="condition.creatorUserId.show">
-        <FormItem :label="$t('creatorUserId')" prop="creatorUserId">
-          <Input v-model="condition.creatorUserId.value"></Input>
+      <Col :span="12" v-if="condition.lastModifierUserId.show">
+        <FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
+          <UserSelect v-model="condition.lastModifierUserId.value"></UserSelect>
         </FormItem>
       </Col>
       <Col :span="12" v-if="condition.lastModificationTime.show">
@@ -116,11 +130,6 @@
           <DatePicker type="daterange" v-model="condition.lastModificationTime.value"></DatePicker>
         </FormItem>
       </Col>
-      <Col :span="12" v-if="condition.lastModifierUserId.show">
-        <FormItem :label="$t('lastModifierUserId')" prop="lastModifierUserId">
-          <Input v-model="condition.lastModifierUserId.value"></Input>
-        </FormItem>
-      </Col>
     </Row>
   </Form>
 </template>
@@ -134,7 +143,6 @@ export default {
         id: { op: "Equal", value: null, show: false },
         routingHeaderId: { op: "Equal", value: null, show: false },
         classId: { op: "Equal", value: null, show: false },
-
         proposeUserId: { op: "Equal", value: null, show: true },
         proposeUserName: { op: "Equal", value: null, show: false },
         departmentId: { op: "Equal", value: null, show: true },
@@ -146,18 +154,19 @@ export default {
         executiveBranch: { op: "Equal", value: null, show: false },
         executiveBranchId: { op: "Equal", value: null, show: true },
         handlingOpinionsId: { op: "Equal", value: null, show: true },
-        handlingOpinions: { op: "Equal", value: null, show: true },
-        changeReason: { op: "Equal", value: null, show: true },
+        handlingOpinions: { op: "Equal", value: null, show: false },
+        changeReason: { op: "Equal", value: null, show: false },
         checkPerson: { op: "Equal", value: null, show: true },
         approvalPerson: { op: "Equal", value: null, show: true },
-        status: { op: "Equal", value: null, show: true },
+        status: { op: "Equal", value: null, show: false },
         note: { op: "Equal", value: null, show: true },
 
-         creationTime: { op: "Range", value: null, show: true },
+        creationTime: { op: "Range", value: null, show: true },
         creatorUserId: { op: "Equal", value: null, show: true },
         lastModificationTime: { op: "Range", value: null, show: true },
         lastModifierUserId: { op: "Equal", value: null, show: true },
-
+        changeorderCode: { op: "Equal", value: null, show: true },
+        printData: { op: "Range", value: null, show: true }
       }
     };
   },