订单字段部分字段调整

zkqy-ui/src/views/orderMange/ProductInvoice/index.vue

@@ -1,32 +1,33 @@
 <template>
-  <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-      label-width="68px"
-    >
-      <el-form-item label="通知单号" prop="noticeNumber">
-        <el-input
-          v-model="queryParams.noticeNumber"
-          placeholder="请输入通知单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="日期" prop="noticeDate">
-        <el-date-picker
-          clearable
-          v-model="queryParams.noticeDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择通知日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <!-- <el-form-item label="状态" prop="status">
+  <el-card shadow="always" :body-style="{ padding: '10px' }">
+    <div class="app-container">
+      <el-form
+        :model="queryParams"
+        ref="queryForm"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="68px"
+      >
+        <el-form-item label="通知单号" prop="noticeNumber">
+          <el-input
+            v-model="queryParams.noticeNumber"
+            placeholder="请输入通知单号"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="日期" prop="noticeDate">
+          <el-date-picker
+            clearable
+            v-model="queryParams.noticeDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="请选择通知日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="状态" prop="status">
         <el-select
           v-model="queryParams.status"
           value-key=""
@@ -45,45 +46,45 @@
         </el-select>
       </el-form-item> -->
 
-      <el-form-item label="客户" prop="customerId">
-        <!-- <el-input
+        <el-form-item label="客户" prop="customerId">
+          <!-- <el-input
           v-model="queryParams.customerId"
           placeholder="请输入客户编号"
           clearable
           @keyup.enter.native="handleQuery"
         /> -->
-        <el-select
-          v-model="queryParams.customerId"
-          placeholder="请选择客户"
-          clearable
-          filterable
-          @change="handleQuery"
-        >
-          <el-option
-            v-for="item in customerOptions"
-            :key="item.id"
-            :label="item.customName"
-            :value="item.id"
+          <el-select
+            v-model="queryParams.customerId"
+            placeholder="请选择客户"
+            clearable
+            filterable
+            @change="handleQuery"
           >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-          >搜索</el-button
-        >
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-          >重置</el-button
-        >
-      </el-form-item>
-    </el-form>
+            <el-option
+              v-for="item in customerOptions"
+              :key="item.id"
+              :label="item.customName"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索</el-button
+          >
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+            >重置</el-button
+          >
+        </el-form-item>
+      </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <!-- <el-col :span="1.5">
+      <el-row :gutter="10" class="mb8">
+        <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -129,32 +130,32 @@
           >导出</el-button
         >
       </el-col> -->
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
-    </el-row>
+        <right-toolbar
+          :showSearch.sync="showSearch"
+          @queryTable="getList"
+        ></right-toolbar>
+      </el-row>
 
-    <el-table
-      v-loading="loading"
-      :data="ProductInvoiceList"
-      @selection-change="handleSelectionChange"
-    >
-      <!-- <el-table-column label="编号" align="center" prop="id" />
-       -->
-      <el-table-column
-        label="日期"
-        align="center"
-        prop="noticeDate"
-        width="180"
+      <el-table
+        v-loading="loading"
+        :data="ProductInvoiceList"
+        @selection-change="handleSelectionChange"
       >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.noticeDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="通知单号" align="center" prop="noticeNumber" />
+        <!-- <el-table-column label="编号" align="center" prop="id" />
+       -->
+        <el-table-column
+          label="日期"
+          align="center"
+          prop="noticeDate"
+          width="180"
+        >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.noticeDate, "{y}-{m}-{d}") }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="通知单号" align="center" prop="noticeNumber" />
 
-      <!-- <el-table-column label="销售员" align="center" prop="salesman" />
+        <!-- <el-table-column label="销售员" align="center" prop="salesman" />
       <el-table-column label="客户编号" align="center" prop="customerId" />
       <el-table-column label="开票员" align="center" prop="drawer" />
       <el-table-column
@@ -162,7 +163,7 @@
         align="center"
         prop="dispatchNoteRemark"
       /> -->
-      <!-- <el-table-column label="开票类型" align="center" prop="billingType" />
+        <!-- <el-table-column label="开票类型" align="center" prop="billingType" />
       <el-table-column
         label="货车登记"
         align="center"
@@ -172,53 +173,54 @@
       <el-table-column label="售货单位" align="center" prop="sellingUnit" />
       <el-table-column label="计算类型" align="center" prop="calculationType" />
       <el-table-column label="审核意见" align="center" prop="auditOpinion" /> -->
-      <el-table-column label="客户名称" align="center" prop="customerName" />
-      <el-table-column label="状态" align="center" prop="status" />
+        <el-table-column label="客户名称" align="center" prop="customerName" />
+        <el-table-column label="状态" align="center" prop="status" />
 
-      <!-- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
+        <!-- <el-table-column label="销售单合同号" align="center" prop="saleOrderNo" />
       <el-table-column label="备注" align="center" prop="remark" /> -->
-      <el-table-column
-        label="操作"
-        align="center"
-        class-name="small-padding fixed-width"
-      >
-        <template slot-scope="scope">
-          <el-dropdown>
-            <el-button type="warning" plain size="small">
-              处理<i class="el-icon-arrow-down el-icon--right"></i>
-            </el-button>
-            <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item>
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="handleDeliverOrder(scope.$index, scope.row)"
-                  >打印发货单</el-button
-                >
-              </el-dropdown-item>
-              <el-dropdown-item>
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="handleSendOrder(scope.$index, scope.row)"
-                  >打印送货单</el-button
-                >
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </el-dropdown>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table-column
+          label="操作"
+          align="center"
+          class-name="small-padding fixed-width"
+        >
+          <template slot-scope="scope">
+            <el-dropdown>
+              <el-button type="warning" plain size="small">
+                处理<i class="el-icon-arrow-down el-icon--right"></i>
+              </el-button>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item>
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="handleDeliverOrder(scope.$index, scope.row)"
+                    >打印发货单</el-button
+                  >
+                </el-dropdown-item>
+                <el-dropdown-item>
+                  <el-button
+                    type="text"
+                    size="mini"
+                    @click="handleSendOrder(scope.$index, scope.row)"
+                    >打印送货单</el-button
+                  >
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+      </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <div id="printDom"></div>
-  </div>
+      <pagination
+        v-show="total > 0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+      <div id="printDom"></div>
+    </div>
+  </el-card>
 </template>
 
 <script>

zkqy-ui/src/views/orderMange/approve.vue

@@ -362,7 +362,7 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="productSpecifications" label="规格">
+              <el-table-column prop="productType" label="类型">
               </el-table-column>
               <el-table-column prop="productNumber" label="数量/kg">
                 <template slot-scope="scope">
@@ -1188,7 +1188,7 @@ export default {
         saleProductNo: uuidv4(),
         productNo: "", //货品编号
         productName: "", //货品名称
-        productSpecifications: "", //规格
+        productType: "", //类型
         productNumber: "", //销售数量
         productWeight: "", //销售重量kg
         productUnitPrice: "", //单价
@@ -1461,7 +1461,7 @@ export default {
           };
           this.productionTableData.forEach((item) => {
             item.saleOrderNo = saleNo;
-            delete item.productSpecifications;
+            delete item.productType;
           });
           let productData = {
             //货品表新增数据
@@ -1604,9 +1604,9 @@ export default {
           this.productIds = sale_products.map((item) => item.saleProductNo);
           await this.getDropDownData();
           this.productionTableData = sale_products.map((item) => {
-            item.productSpecifications = this.productionOptions.find(
+            item.productType = this.productionOptions.find(
               (i) => item.productNo == i.productNo
-            )?.productSpecifications;
+            )?.productType;
             return item;
           });
           this.title = "审批审计单";

zkqy-ui/src/views/orderMange/index.vue

@@ -438,7 +438,7 @@
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column prop="productSpecifications" label="规格">
+              <el-table-column prop="productType" label="规格">
               </el-table-column>
               <el-table-column prop="productNumber" label="数量/kg">
                 <template slot-scope="scope">
@@ -1064,9 +1064,9 @@ export default {
       row.productName = this.productionOptions.find(
         (item) => item.productNo == productNo
       )?.productName;
-      row.productSpecifications = this.productionOptions.find(
+      row.productType = this.productionOptions.find(
         (item) => item.productNo == productNo
-      )?.productSpecifications;
+      )?.productType;
     },
     // 订单类型改变回调
     orderTypeChange(type) {
@@ -1164,7 +1164,7 @@ export default {
       this.productionTableData.push({
         saleProductNo: uuidv4(),
         productNo: "", //货品编号
-        productSpecifications: "", //规格
+        productType: "", //类型
         productName: "", //货品名称
         productNumber: "", //销售数量
         productWeight: "", //销售重量kg
@@ -1569,7 +1569,7 @@ export default {
             delete item.delFlag;
             delete item.sliceTypeLabel;
             delete item.colourNumberLabel;
-            delete item.productSpecifications; //删除规格
+            delete item.productType; //删除类型
             const matchedOption = this.colourNumberOptions.find(
               (option) => option.materielCode === item.colourNumber
             );
@@ -1582,7 +1582,7 @@ export default {
             item.taskName = taskName;
           });
           this.productionTableData.forEach((item) => {
-            delete item.productSpecifications; //删除产品类型
+            delete item.productType; //删除产品类型
           });
           let productData = {
             //货品表新增数据
@@ -1719,9 +1719,9 @@ export default {
 
           await this.getDropDownData();
           this.productionTableData = sale_products.map((item) => {
-            item.productSpecifications = this.productionOptions.find(
+            item.productType = this.productionOptions.find(
               (i) => item.productNo == i.productNo
-            )?.productSpecifications;
+            )?.productType;
             return item;
           });
           if (this.formData.saleCustomNo) {
@@ -2819,12 +2819,10 @@ export default {
             (k) => k.materielCode == item.colourNumber
           )?.materieColorNumber;
           let productName = productData ? productData.productName : "";
-          let productSpecifications = productData
-            ? productData.productSpecifications
-            : "";
+          let productType = productData ? productData.productType : "";
           printStr += `<tr align="center">
                     <td>${productName}</td>    
-                    <td>${productSpecifications}</td>    
+                    <td>${productType}</td>    
                     <td>${item.productNumber}</td>
                     <td>${item.productUnitPrice}</td>
                     <td>${item.productAmounts}</td>