Merge remote-tracking branch 'origin/dev' into dev

src/views/inout/InvoiceRegByFp.vue

@@ -680,7 +680,6 @@ export default {
       // this.resultDetailList = [];
     },
     handleInvoiceChange(val) {
-      debugger
       this.cowEn=val;
       this.getOrderList(val)
       this.getProductDetailList(val)

src/views/inout/InvoiceRegCkeck.vue

@@ -1,6 +1,8 @@
 <template>
   <div style="display: flex; flex-direction: column">
-    <el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right" @click="onSubmit">登记</el-button>
+    <el-button size="small" style="margin-left: auto; margin-right: 15px" type="primary" icon="el-icon-bottom-right"
+               @click="onSubmit">登记
+    </el-button>
     <el-form :model="inputQuery" :rules="formRules" ref="dataForm" label-width="150px" style="padding-top: 40px">
       <el-card style="margin-top: -30px">
         <el-row>
@@ -150,7 +152,8 @@
         >选择单据
         </el-button>
       </el-button-group>
-      <el-table v-loading="loading"  @current-change="handleSelectionChange" :data="list" style="width: 100%" highlight-current-row border>
+      <el-table v-loading="loading" @current-change="handleSelectionChange" :data="list" style="width: 100%"
+                highlight-current-row border>
         <el-table-column label="序号" type="index"></el-table-column>
         <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>
         <el-table-column label="单据类型" prop="billTypeName" width="150"></el-table-column>
@@ -171,13 +174,13 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination
+<!--      <pagination-->
-        v-show="total > 0"
+      <!--        v-show="total > 0"-->
-        :total="total"
+      <!--        :total="total"-->
-        :page.sync="filterQuery.page"
+      <!--        :page.sync="filterQuery.page"-->
-        :limit.sync="filterQuery.limit"
+      <!--        :limit.sync="filterQuery.limit"-->
-        @pagination="getCodeDetailLists"
+      <!--        @pagination="getCodeDetailLists"-->
-      />
+      <!--      />-->
     </el-tabs>
 
 
@@ -309,9 +312,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        page: 1,
         supInoivceSearch: 'supInvoice',
-        limit: 10,
         startTime: null,
         endTime: null,
       },

src/views/inout/IoDeliverySearchOrder.vue

@@ -45,7 +45,7 @@
                          clearable>
                 <el-option
                   v-for="item in busTypes"
-                  :key="item.name"
+                  :key="item.id"
                   :label="item.name"
                   :value="item.action">
                   <span style="float: left">{{ item.name }}</span>
@@ -479,11 +479,18 @@
             prop="manufacturer"
             show-overflow-tooltip
           ></el-table-column>
-          <el-table-column
+<!--          <el-table-column-->
-            label="注册/备案号" width="180"
+<!--            label="注册/备案号" width="180"-->
-            prop="certCode"
+<!--            prop="certCode"-->
-            show-overflow-tooltip
+<!--            show-overflow-tooltip-->
-          ></el-table-column>
+<!--          ></el-table-column>-->
+          <el-table-column label="注册/备案号" width="180">
+            <template slot-scope="scope">
+              <div v-if="scope.row.certCode">
+                <span>{{ scope.row.certCode.split(',')[0] }}</span>
+              </div>
+            </template>
+          </el-table-column>
         </el-table>
         <pagination
           v-show="codeTotal>0"

src/views/purchase/purOrder/purOrderDetailDialog.vue

@@ -33,13 +33,13 @@
         <el-row>
           <el-col :span="11">
             <el-form-item label="紧急程度:" prop="emergency">
-              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
+              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable>
-                         clearable>
+                <el-option label="正常" value=1></el-option>
-                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" value=2></el-option>
-                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" value=3></el-option>
-                <el-option label="特急" :value=3></el-option>
               </el-select>
             </el-form-item>
+
           </el-col>
           <el-col :span="11">
             <el-form-item label="到货截止:" prop="arrivalTime">
@@ -215,6 +215,7 @@ export default {
         autoPurchase: true,
         targetInv: 1000,
         targetSubInv: null,
+        emergency: null,
         targetBillAction: null
       },
       formRules: {},
@@ -460,7 +461,7 @@ export default {
     targetInvChange() {
       let query = {
         enable: true,
-        spUse: 1,
+        spUse: true,
         invCode: this.formData.invCode
       }
       getLocalJoinByUser(query)

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -749,7 +749,7 @@
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">
-                    <span>包装级别:&nbsp;</span>
+                    <span>包装层级:&nbsp;</span>
                   </div>
 
                   <el-input
@@ -1032,6 +1032,9 @@ export default {
       this.thisData = this.editQuery;
       this.selectErpDialogVisible = true;
     },
+    handleDetail(row) {
+      this.editQuery = row;
+    },
     removeDi() {
       this.$confirm("此操作将解除该绑定DI器械信息, 是否继续?", "提示", {
         confirmButtonText: "确定",