1.2 增加往来单位类型

src/views/basic/collectPoint/selectWorkplace.vue

@@ -67,7 +67,12 @@
           </template>
         </el-table-column>
         <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
-        <el-table-column label="往来单位标题" prop="unitTittle" width="90"></el-table-column>
+        <el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>
+        <el-table-column label="往来单位类型" prop="corpType" width="100">
+          <template slot-scope="scope">
+            <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
         <el-table-column label="备注" prop="remake" width="90"></el-table-column>
         <el-table-column label="操作" fixed="right" width="50">
@@ -361,6 +366,12 @@ export default {
         1: '信息提醒',
         2: '禁止录入',
       },
+      corpTypeMap: {
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+      },
       radioCheck: '',
       rowData: {},
       rowList:[]

src/views/basic/collectPoint/userWorkplace.vue

@@ -127,6 +127,11 @@
           </el-table-column>
           <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
           <el-table-column label="往来单位标题" prop="unitTittle" width="100"></el-table-column>
+          <el-table-column label="往来单位类型" prop="corpType" width="100">
+            <template slot-scope="scope">
+              <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+            </template>
+          </el-table-column>
           <el-table-column label="创建时间" prop="createTime" width="90"></el-table-column>
           <el-table-column label="备注" prop="remake" width="90"></el-table-column>
           <el-table-column label="操作" fixed="right" width="100">
@@ -389,6 +394,12 @@ export default {
         1: '信息提醒',
         2: '禁止录入'
       },
+      corpTypeMap: {
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+      },
       userId: '',
       workPlaceCode: [],
       addWorkplaceDialogVisible: false,

src/views/basic/workplace/workplaceManage.vue

@@ -131,6 +131,11 @@
               </el-table-column>
               <el-table-column label="负责人" prop="employeeName" width="90"></el-table-column>
               <el-table-column label="往来单位标题" prop="unitTittle" width="120"></el-table-column>
+              <el-table-column label="往来单位类型" prop="corpType" width="100">
+                <template slot-scope="scope">
+                  <span>{{ corpTypeMap[scope.row.corpType] }}</span>
+                </template>
+              </el-table-column>
               <el-table-column label="创建时间" prop="createTime" width="140"></el-table-column>
               <el-table-column label="备注" prop="remake" width="140"></el-table-column>
               <el-table-column label="操作" fixed="right" width="120">
@@ -339,7 +344,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="单据类型:" prop="busType" class="query-form-item">
+            <el-form-item label="单据类型:" prop="orderId" class="query-form-item">
               <el-select v-model="formData.orderId" placeholder="请选择单据类型"
                          style="width: 80%"
                          clearable
@@ -356,7 +361,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" class="el-col">
-            <el-form-item label="所属组别:" prop="grouping" class="query-form-item">
+            <el-form-item label="所属组别:" prop="constituencies" class="query-form-item">
               <el-select v-model="formData.constituencies" placeholder="请选择所属组别"
                          style="width: 80%"
                          clearable
@@ -372,6 +377,16 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">
+              <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" clearable>
+                <el-option label="客户" :value="1"></el-option>
+                <el-option label="供应商" :value="2"></el-option>
+                <el-option label="内部科室" :value="3"></el-option>
+                <el-option label="特殊往来" :value="4"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
           <el-col :span="12" class="el-col">
@@ -383,6 +398,17 @@
             </el-form-item>
           </el-col>
         </el-row>
+
+        <!--<el-col :span="12" class="el-col">-->
+        <!--  <el-form-item label="往来单位类型:" prop="corpType" class="query-form-item">-->
+        <!--    <el-select v-model="formData.corpType" style="width: 80%" placeholder="选择往来单位类型" clearable>-->
+        <!--      <el-option label="客户" :value="1"></el-option>-->
+        <!--      <el-option label="供应商" :value="2"></el-option>-->
+        <!--      <el-option label="内部科室" :value="3"></el-option>-->
+        <!--      <el-option label="特殊往来" :value="4"></el-option>-->
+        <!--    </el-select>-->
+        <!--  </el-form-item>-->
+        <!--</el-col>-->
         <el-row :gutter="24" class="el-row">
           <el-col :span="22" class="el-col">
             <el-form-item label="备注:" prop="unitTittle" class="query-form-item">
@@ -538,6 +564,9 @@ export default {
         invCode: [
           { required: true, message: '请选择仓库', trigger: 'blur' }
         ],
+        orderId: [
+          { required: true, message: '请选择单据类型', trigger: 'blur' }
+        ],
         constituencies: [
           { required: true, message: '请选择所属组别', trigger: 'blur' }
         ]
@@ -552,6 +581,12 @@ export default {
         2: '按单校验三期',
         3: '按单不校验三期'
       },
+      corpTypeMap: {
+        1: '客户',
+        2: '供应商',
+        3: '内部科室',
+        4: '特殊往来',
+      },
       checkInserts: {
         1: '不插入',
         2: '插入'