8/23 是否拆零隐藏 业务类型增加单据流通方式

src/views/basic/product/productEdit.vue

@@ -711,23 +711,23 @@
                 <span class="sptext">是否必须维护资质材料</span>
               </el-col>
             </el-row>
-            <el-divider></el-divider>
+            <!--<el-divider></el-divider>-->
-            <el-row>
+            <!--<el-row>-->
-              <el-col span="5">
+            <!--  <el-col span="5">-->
-                <span class="sptext">是否拆零</span>
+            <!--    <span class="sptext">是否拆零</span>-->
-              </el-col>
+            <!--  </el-col>-->
-              <el-divider direction="vertical"></el-divider>
+            <!--  <el-divider direction="vertical"></el-divider>-->
-              <el-col span="5">
+            <!--  <el-col span="5">-->
-                <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>
+            <!--    <el-select v-model="editQuery.splitEnable" style="width: 65%" placeholder="是否拆零" clearable>-->
-                  <el-option label="是" :value="true"></el-option>
+            <!--      <el-option label="是" :value="true"></el-option>-->
-                  <el-option label="否" :value="false"></el-option>
+            <!--      <el-option label="否" :value="false"></el-option>-->
-                </el-select>
+            <!--    </el-select>-->
-              </el-col>
+            <!--  </el-col>-->
-              <el-divider direction="vertical"></el-divider>
+            <!--  <el-divider direction="vertical"></el-divider>-->
-              <el-col span="13">
+            <!--  <el-col span="13">-->
-                <span class="sptext">是否拆零</span>
+            <!--    <span class="sptext">是否拆零</span>-->
-              </el-col>
+            <!--  </el-col>-->
-            </el-row>
+            <!--</el-row>-->
             <el-divider></el-divider>
             <el-row>
               <el-col span="5">

src/views/basic/workplace/addBusTypeDialog.vue

@@ -89,6 +89,15 @@
           </el-form-item>
         </el-col>
 
+        <el-col :span="12" class="el-col">
+          <el-form-item label="单据流通方式:" prop="orderCirType" class="query-form-item">
+            <el-select v-model="formData.orderCirType" style="width: 80%" placeholder="选择扫码方式" clearable>
+              <el-option label="配送流通" :value="1"></el-option>
+              <el-option label="出库使用" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+
 
         <el-col :span="12" class="el-col">
           <el-form-item label="默认仓库:" prop="invCode" class="query-form-item">
@@ -227,6 +236,9 @@ export default {
         warnType: [
           { required: true, message: '请选择异常方式提醒', trigger: 'blur' }
         ],
+        orderCirType: [
+          { required: true, message: '请选择单据流通方式', trigger: 'blur' }
+        ],
         corpType: [
           // { required: true, message: '请选择往来单位类型', trigger: 'blur' }
         ],

src/views/basic/workplace/workplaceManage.vue

@@ -254,10 +254,10 @@
                         highlight-current-row
               >
                 <el-table-column type="index" label="序号"></el-table-column>
-                <el-table-column label="业务类型编码 " prop="documentTypeCode"></el-table-column>
+                <el-table-column label="业务类型编码 " prop="documentTypeCode" width="100"></el-table-column>
                 <el-table-column label="业务名称 " prop="busName"></el-table-column>
                 <el-table-column label="仓库名称 " prop="invName"></el-table-column>
-                <el-table-column label="是否配套系统" prop="isMatching">
+                <el-table-column label="是否配套系统" prop="isMatching" width="100">
                   <template slot-scope="scope">
                     <span>{{ isMatchings[scope.row.isMatching] }}</span>
                   </template>
@@ -272,17 +272,22 @@
                     <span>{{ checkInserts[scope.row.checkInsert] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="异常方式提醒" prop="warnType">
+                <el-table-column label="单据流通方式 " prop="orderCirType" width="100">
+                  <template slot-scope="scope">
+                    <span>{{ orderCirTypes[scope.row.orderCirType] }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="异常方式提醒" prop="warnType" width="100">
                   <template slot-scope="scope">
                     <span>{{ warnTypeMap[scope.row.warnType] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="往来单位类型" prop="corpType">
+                <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="unitTittle"></el-table-column>
+                <el-table-column label="往来类型标题" prop="unitTittle" width="100"></el-table-column>
                 <el-table-column label="操作" fixed="right" width="120">
                   <template slot-scope="scope">
                     <el-button
@@ -770,6 +775,10 @@ export default {
         2: '自动不添加',
         3: '根据提醒决定'
       },
+      orderCirTypes: {
+        1: '配送流通',
+        2: '出库使用',
+      },
       workplaceStatusMap: {
         0: '暂停',
         1: '启用'