Merge remote-tracking branch 'origin/dev2.0' into dev2.0

# Conflicts:
#	src/views/purchase/company/supCompanyAduditDialog.vue
#	src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
#	src/views/purchase/product/supProductAuditDialog.vue

src/views/inout/DialogCreateOrder.vue

@@ -51,22 +51,6 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="11">
-            <el-form-item prop="action" label="单据类型:">
-              <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
-                         :disabled="corpOrderIdDisabled"
-                         style="width: 90%"
-                         @change="actionChange">
-                <el-option
-                  v-for="item in busTypeOptions"
-                  :key="item.action"
-                  :label="item.name"
-                  :value="item.action">
-                  <span style="float: left">{{ item.name }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="11">
             <el-form-item prop="invCode" label="收货仓库:">
@@ -87,6 +71,24 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="11">
+            <el-form-item prop="action" label="单据类型:">
+              <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
+                         :disabled="corpOrderIdDisabled"
+                         style="width: 90%"
+                         @change="actionChange">
+                <el-option
+                  v-for="item in busTypeOptions"
+                  :key="item.action"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
         </el-row>
         <el-row>
           <el-col :span="11">

src/views/purchase/company/supCompanyAduditDialog.vue

@@ -168,12 +168,24 @@
                          @click.native="printSupCert(scope.row)">打印
               </el-button>
               <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
+              <el-button
+                type="text"
+                size="small"
+                @click.native="showImgViewer(scope.row)"
+              >预览
+              </el-button>
               <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
                 撤回
               </el-button>
             </template>
           </el-table-column>
         </el-table>
+        <el-image-viewer
+          v-if="imgViewer"
+          style="z-index: 9999"
+          :on-close="closeImgViewer"
+          :url-list="imgList"
+        />
         <el-pagination
           :page-size="certQuery.limit"
           @current-change="certHandleCurrentChange"
@@ -336,6 +348,7 @@ export default {
       BASE_URL: process.env.VUE_APP_BASE_API,
       headers: {},
       imgViewerVisible: false,
+      imgViewer: false,
       imgList: [],
       classesDisplay: false,
       selectedOptions: [],
@@ -531,24 +544,23 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      newWindow.document.write(row.filePath)
+      this.imgList = [];
-      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-      // this.imgList = [];
+        if (response.code === 20000) {
-      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+          this.imgList = response.data;
-      //   if (response.code === 20000) {
+        }
-      //     this.imgList = response.data;
+      });
-      //   }
+      this.imgViewer = true;
-      // });
+      const m = (e) => {
-      // this.imgViewerVisible = true;
+        e.preventDefault()
-      // const m = (e) => {
+      };
-      //   e.preventDefault()
+      document.body.style.overflow = 'hidden';
-      // };
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
-      // document.body.style.overflow = 'hidden';
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
+      this.imgViewer = false;
       const m = (e) => {
         e.preventDefault()
       };

src/views/purchase/manufacturer/supManufacturerAuditDialog.vue

@@ -568,6 +568,7 @@ export default {
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
+      this.imgViewer = false;
       const m = (e) => {
         e.preventDefault()
       };

src/views/purchase/product/supProductAuditDialog.vue

@@ -240,12 +240,24 @@
                        @click.native="printSupCert(scope.row)">打印
             </el-button>
             <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
+            <el-button
+              type="text"
+              size="small"
+              @click.native="showImgViewer(scope.row)"
+            >预览
+            </el-button>
             <el-button type="text" size="small" v-if="scope.row.auditStatus==1" @click.native="revoke(scope.row)">
               撤回
             </el-button>
           </template>
         </el-table-column>
       </el-table>
+      <el-image-viewer
+        v-if="imgViewer"
+        style="z-index: 9999"
+        :on-close="closeImgViewer"
+        :url-list="imgList"
+      />
       <el-pagination
         :page-size="certQuery.limit"
         @current-change="certHandleCurrentChange"
@@ -402,6 +414,7 @@ export default {
       fromOptions: [],
       fromPMOptions: [],
       imgViewerVisible: false,
+      imgViewer: false,
       imgList: [],
       pmQuery: {
         customerId: null,
@@ -566,24 +579,23 @@ export default {
         'png', 'jpg', 'jpeg', 'bmp', 'gif', 'webp', 'psd', 'svg', 'tiff'].indexOf(ext.toLowerCase()) !== -1;
     },
     showImgViewer(row) {
-      let newWindow = window.open();
+      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-      newWindow.document.write(row.filePath)
+      this.imgList = [];
-      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-      // this.imgList = [];
+        if (response.code === 20000) {
-      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+          this.imgList = response.data;
-      //   if (response.code === 20000) {
+        }
-      //     this.imgList = response.data;
+      });
-      //   }
+      this.imgViewer = true;
-      // });
+      const m = (e) => {
-      // this.imgViewerVisible = true;
+        e.preventDefault()
-      // const m = (e) => {
+      };
-      //   e.preventDefault()
+      document.body.style.overflow = 'hidden';
-      // };
+      document.addEventListener("touchmove", m, false); // 禁止页面滑动
-      // document.body.style.overflow = 'hidden';
-      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;
+      this.imgViewer = false;
       const m = (e) => {
         e.preventDefault()
       };

src/views/purchase/purOrder/purOrderSearch.vue

@@ -252,7 +252,7 @@
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
-        <el-table-column label="申购数量" prop="count"></el-table-column>
+        <el-table-column label="采购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
         <el-table-column label="供应商" prop="supName"></el-table-column>

src/views/sync/SysUdimsConfig.vue

@@ -109,7 +109,7 @@
               :inline="true"
               disabled
             >
-              <el-form-item label="数据上传时间间隔(单位:分钟):">
+              <el-form-item label="数据上传时间间隔(单位:分钟):" style="padding-top: 20px">
                 <el-input
                   style="width: 100px"
                   size="small"
@@ -128,7 +128,7 @@
               <!--                  splaceholder="请输入内容"-->
               <!--                ></el-input>-->
               <!--              </el-form-item>-->
-              <el-form-item label="数据下载时间间隔(单位:分钟):">
+              <el-form-item label="数据下载时间间隔(单位:分钟):" style="padding-top: 20px">
                 <el-input
                   style="width: 100px"
                   size="small" disabled
@@ -204,21 +204,21 @@
               :inline="true"
               disabled
             >
-              <el-form-item label="业务单据类型">
+              <el-form-item label="业务单据类型" style="padding-top: 20px">
                 <el-select v-model="configQuery.typeBus">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="扫码单据类型">
+              <el-form-item label="扫码单据类型" style="padding-top: 20px">
                 <el-select v-model="configQuery.typeScan">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="第三方单据类型">
+              <el-form-item label="第三方单据类型" style="padding-top: 20px">
                 <el-select v-model="configQuery.typeThird">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
@@ -236,21 +236,21 @@
               :inline="true"
               disabled
             >
-              <el-form-item label="部门信息">
+              <el-form-item label="部门信息" style="padding-top: 20px">
                 <el-select v-model="configQuery.basicDept">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="仓库字典">
+              <el-form-item label="仓库字典" style="padding-top: 20px">
                 <el-select v-model="configQuery.basicInv">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="用户信息">
+              <el-form-item label="用户信息" style="padding-top: 20px">
                 <el-select v-model="configQuery.sysUser">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
@@ -268,21 +268,21 @@
               :inline="true"
               disabled
             >
-              <el-form-item label="耗材字典">
+              <el-form-item label="耗材字典" style="padding-top: 20px">
                 <el-select v-model="configQuery.basicProducts">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="往来单位字典">
+              <el-form-item label="往来单位字典" style="padding-top: 20px">
                 <el-select v-model="configQuery.basicCorp">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="首营资质信息">
+              <el-form-item label="首营资质信息" style="padding-top: 20px">
                 <el-select v-model="configQuery.supCert">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
@@ -293,7 +293,7 @@
           </el-descriptions-item>
           <el-descriptions-item>
             <template slot="label"> 其他数据</template>
-            <el-form label-positiom="right" label-width="200px" :inline="true">
+            <el-form label-positiom="right" label-width="200px" :inline="true" style="padding-top: 20px">
               <el-form-item label="UDI码补齐数据">
                 <el-select v-model="configQuery.udiCodeLost" disabled>
                   <el-option :value="0" label="不同步"></el-option>
@@ -367,14 +367,14 @@
               :inline="true"
               disabled
             >
-              <el-form-item label="DI产品信息">
+              <el-form-item label="DI产品信息" style="padding-top: 20px">
                 <el-select v-model="configQuery.dbDiProducts">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>
                   <el-option :value="2" label="由外向内"></el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="医疗器械注册人">
+              <el-form-item label="医疗器械注册人" style="padding-top: 20px">
                 <el-select v-model="configQuery.dbDiCompany">
                   <el-option :value="0" label="不同步"></el-option>
                   <el-option :value="1" label="由内向外"></el-option>

src/views/system/dept/authDept.vue

@@ -66,8 +66,9 @@
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="部门名称" prop="name"></el-table-column>
         <el-table-column label="部门编码" prop="code"></el-table-column>
-        <el-table-column label="部门名称" prop="name"></el-table-column>
+
-        <el-table-column label="部门编码" prop="code"></el-table-column>
+<!--        <el-table-column label="部门名称" prop="name"></el-table-column>-->
+<!--        <el-table-column label="部门编码" prop="code"></el-table-column>-->
         <el-table-column label="状态" prop="status">
           <template slot-scope="scope">
             <el-tag :type="scope.row.status | statusFilterType"
@@ -75,6 +76,13 @@
             </el-tag>
           </template>
         </el-table-column>
+        <el-table-column label="允许供应商使用" prop="spUse">
+          <template slot-scope="scope">
+            <el-tag :type="scope.row.spUse | spUerFilterType"
+            >{{ scope.row.spUse | spUerFilterName }}
+            </el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="备注" prop="remark"></el-table-column>
         <el-table-column label="操作">
           <template slot-scope="scope">