界面流程相关问题修改

src/views/basic/business/stockOrder.vue

@@ -3,18 +3,16 @@
     <el-card class="el-card">
       <el-form :model="query" label-width="100px" v-show="showSearch">
         <el-row style="width: 100%">
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="单号:">
               <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="6">
-
-            <el-form-item label="状态：" prop="inCodeStatus" clearable>
+          <el-col :span="8">
+            <el-form-item label="打印状态：" prop="inCodeStatus" clearable>
               <el-select v-model="query.inCodeStatus" style="width: 90%">
-                <el-option label="未打印" value="1"></el-option>
-                <el-option label="已打印" value="2"></el-option>
+                <el-option label="未打印" :value="1"></el-option>
+                <el-option label="已打印" :value="2"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -25,7 +23,7 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
 
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item class="query-form-item" label="单据类型:">
               <el-select v-model="query.action" placeholder="请选择单据类型"
                          style="width: 90%"
@@ -40,6 +38,22 @@
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="单据状态:">
+              <el-select v-model="query.status" placeholder="请选择单据状态">
+                <el-option label="草稿" :value=1>草稿</el-option>
+                <el-option label="待校验" :value=3>待校验</el-option>
+                <el-option label="待核对" :value=5>待核对</el-option>
+                <el-option label="待审核" :value=10>待审核</el-option>
+                <el-option label="已审核" :value=7>已审核</el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
           <el-col :span="6">
             <el-form-item label="创建时间:">
               <el-date-picker
@@ -56,7 +70,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
 
       </el-form>
@@ -154,7 +167,7 @@
     </el-card>
 
     <el-dialog
-      title="内部码详情"
+      title="内部码管理"
       :visible.sync="qrcodeDetailVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
@@ -205,11 +218,13 @@ export default {
         invWarehouseCode: this.$store.getters.locSubInvCode,
         billNo: "",
         status: "",
+        action: null,
+        statusType: "supInCode",
         page: 1,
         limit: 10,
         startTime: "",
         endTime: "",
-        inCodeStatus: null,
+        inCodeStatus: 2,
       },
       detailQuery: {
         orderIdFk: "",
@@ -314,13 +329,19 @@ export default {
         path: ""
       });
       this.query = {
+        billType: null,
+        corpName: null,
+        locStorageCode: this.$store.getters.locInvCode,
+        invWarehouseCode: this.$store.getters.locSubInvCode,
         billNo: "",
         status: "",
+        action: null,
+        statusType: "supInCode",
         page: 1,
         limit: 10,
         startTime: "",
         endTime: "",
-        locStorageCode: store.getters.customerId,
+        inCodeStatus: 2,
       };
       this.getList();
 

src/views/basic/business/stockOrderQRCodeDetail.vue

@@ -1,9 +1,9 @@
 <template>
   <div>
-
+    <el-card>
       <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="100px">
         <el-row type="flex" justify="end">
-            <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;margin-top: -10px">
+          <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px;">
             <el-button type="primary" @click.native="generateQRCodeText()" :loading="loading">生成内部码</el-button>
             <el-button type="primary" @click.native="printStockOrderDetailPDF()" :loading="loading">打印全部</el-button>
             <el-switch style="margin-left: 50px;" v-model="filterUDIType" active-text="过滤已有UDI码的产品"></el-switch>
@@ -17,25 +17,28 @@
           </el-col>
           <el-col :span="11">
             <el-form-item label="单据日期" prop="billdate">
-                        <el-input v-model="formData.createTime" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="formData.createTime" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
           <el-col :span="11">
             <el-form-item label="送货单位" prop="corpName">
-                        <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="formData.customerName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="11">
             <el-form-item label="业务类型" prop="billTypeName">
-                      <el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+              <el-input v-model="formData.billTypeName" style="width: 90%" auto-complete="off"
+                        :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
-
-
+      </el-form>
+    </el-card>
+    <el-card>
       <el-table v-loading="loading" :data="codeArray" style="width: 100%;" max-height="350" height="350"
                 border ref="multipleTable">
         <el-table-column label="序号" type="index" width="50"></el-table-column>
@@ -58,7 +61,7 @@
             <span>{{ scope.row.updateTime }}</span>
           </template>
         </el-table-column>
-              <el-table-column label="操作"width="150">
+        <el-table-column label="操作" width="150">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -70,7 +73,6 @@
           </template>
         </el-table-column>
       </el-table>
-
       <div class="block">
         <pagination
           v-show="total>0"
@@ -80,7 +82,7 @@
           @pagination="handleCurrentChange"
         ></pagination>
       </div>
-        </el-form>
+    </el-card>
 
 
     <el-dialog
@@ -195,7 +197,7 @@ export default {
         printCodeIdFk: null,
         stockOrderFk: null,
       },
-            filterUDIType:false,
+      filterUDIType: false,
       statusMap: {
         0: "未打印",
         1: "已打印",
@@ -281,7 +283,7 @@ export default {
         type: "warning",
       }).then(() => {
         this.loading = true;
-          generateInCodeQRCodeText({orderIdFk:this.formData.billNo,chack:this.filterUDIType})
+        generateInCodeQRCodeText({orderIdFk: this.formData.billNo, chack: this.filterUDIType})
           .then(response => {
             this.loading = false;
             if (response.code === 20000) {
@@ -405,7 +407,8 @@ export default {
         2: "danger"
       };
       return statusMap[status];
-      }},
+    }
+  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
@@ -419,7 +422,7 @@ export default {
     this.codeArray = [];
     if (this.$isNotBlank(this.idQuery.id)) {
       this.formData = this.idQuery.formData;
-            this.query.orderIdFk=this.formData.billNo;
+      this.query.orderIdFk = this.formData.billNo;
       this.query.sOrderId = this.formData.orderIdFk;
       this.getStockQRCodeTextList();
     }

src/views/purchase/product/supProductEditDialog.vue

@@ -278,7 +278,7 @@
                 highlight-current-row>
         <el-table-column type="index" label="序号" width="50"></el-table-column>
         <el-table-column label="证书名称" prop="name"></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="vailDate"></el-table-column>
         <el-table-column label="失效期" prop="expireDate"></el-table-column>
         <el-table-column label="审核状态" prop="auditStatus" width="120">

src/views/supplier/company/basicCompanyproductEdit.vue

@@ -237,6 +237,7 @@ export default {
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,
         isDateBy: this.editQuery.isDateBy,
+        relSupId:this.editQuery.id,
       }
 
       updateById(data).then(res => {