完善

jp-mobile/pages/commonseal/commonCard.vue

@@ -360,18 +360,6 @@
 			},
 		},
 		props: {
-			isoffice: {
-				type: Boolean,
-				default: false
-			},
-			isleader: {
-				type: Boolean,
-				default: false
-			},
-			isinfo: {
-				type: Boolean,
-				default: false
-			},
 			gwId: {
 				type: String,
 

jp-ui/src/views/yzcirculation/YzCirculationCardForm.vue

@@ -7,13 +7,13 @@
         <el-col :span="12">
           <el-form-item label="年份" prop="yearNum" :rules="[
   ]">
-            <el-input v-model="inputForm.yearNum" placeholder="请填写年份"></el-input>
+            <el-input readonly v-model="inputForm.yearNum" placeholder="请填写年份"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="卡号" prop="cardNum" :rules="[
   ]">
-            <el-input v-model="inputForm.cardNum" placeholder="请填写卡号"></el-input>
+            <el-input readonly v-model="inputForm.cardNum" placeholder="请填写卡号"></el-input>
           </el-form-item>
         </el-col>
 
@@ -24,16 +24,16 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="拟稿人" prop="authorPerson" :rules="[
+          <el-form-item label="拟稿人" readonly prop="authorPerson" :rules="[
   ]">
-            <el-input v-model="inputForm.authorPerson" placeholder="请填写拟稿人"></el-input>
+            <el-input readonly v-model="user.name" placeholder="请填写拟稿人"></el-input>
             <!-- <user-select :limit='1' v-model="inputForm.authorPerson"></user-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="校对人" prop="proofreader" :rules="[
   ]">
-            <el-input v-model="inputForm.proofreader" placeholder="请填写校对人"></el-input>
+            <office-user-select v-model="inputForm.proofreader" :limit="1" title="校对人"></office-user-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -54,28 +54,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="状态" prop="state" :rules="[
+          <el-form-item label="备注" prop="remark" :rules="[
   ]">
-            <el-select v-model="inputForm.state" placeholder="请选择" style="width: 100%;">
-              <el-option v-for="item in $dictUtils.getDictList('gw_state')" :key="item.value" :label="item.label"
-                :value="item.value">
-              </el-option>
-            </el-select>
+            <el-input v-model="inputForm.remark" placeholder="请填写备注"></el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="24">
           <el-form-item label="附件" prop="attachment" :rules="[
   ]">
             <file-upload v-model="inputForm.attachment" :limit="3" tip="最多上传3个文件,单个文件不要超过10M"></file-upload>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="备注" prop="remark" :rules="[
-  ]">
-            <el-input v-model="inputForm.remark" placeholder="请填写备注"></el-input>
-          </el-form-item>
-        </el-col>
+
       </el-row>
     </el-form>
     <template #footer>
@@ -91,6 +81,7 @@
 <script>
 import UserSelect from '@/components/userSelect'
 import yzCirculationCardService from '@/api/yzcirculation/yzCirculationCardService'
+import officeUserSelect from "@/components/officeUserSelect/index.vue";
 export default {
   data() {
     return {
@@ -98,13 +89,14 @@ export default {
       method: '',
       visible: false,
       loading: false,
+      user: '',
       inputForm: {
         id: '',
         name: '',
         authorPerson: '',
         proofreader: '',
-        open: '',
-        printNum: '',
+        open: '1',
+        printNum: '1',
         state: '',
         cardNum: '',
         yearNum: '',
@@ -114,7 +106,7 @@ export default {
     }
   },
   components: {
-    UserSelect
+    officeUserSelect
   },
   created() {
   },
@@ -133,6 +125,15 @@ export default {
       this.loading = false
       this.$nextTick(() => {
         this.$refs.inputForm.resetFields()
+        yzCirculationCardService.getCardNum().then(data => {
+          this.user = JSON.parse(window.localStorage.getItem('USER_INFO'))
+          this.inputForm.authorPerson = this.user.id
+          const currentYear = new Date().getFullYear();
+          this.inputForm.yearNum = currentYear
+          this.cardNum = data
+          this.inputForm.cardNum = data
+        })
+
         if (method === 'edit' || method === 'view') { // 修改或者查看
           this.loading = true
           yzCirculationCardService.queryById(this.inputForm.id).then((data) => {