采购管理相关模块列表样式调整，spu关联产品整改

src/views/order-management/afterSales/addAfterSales.vue

@@ -94,7 +94,7 @@
           </el-input>
         </el-form-item>
 
-        <div style="margin-bottom: 20px" v-if="!isAdd">
+        <div style="margin-top: 20px" v-if="!isAdd">
           <labelTitle content="跟进记录"></labelTitle>
         </div>
         <el-form-item label="售后状态" prop="afterSalesStatus" v-if="!isAdd">
@@ -133,11 +133,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <el-dialog

src/views/order-management/afterSales/index.vue

@@ -143,22 +143,12 @@ export default {
       };
       this.isAdd = false;
       this.open = true;
-      // this.$confirm("是否确认进行该操作", {
-      //   confirmButtonText: this.$t("submitText"),
-      //   cancelButtonText: this.$t("cancelText"),
-      //   type: "warning",
-      // }).then(() => {
-      //   API.orderEdit({ id: row.id, status }).then(() => {
-      //     this.msgSuccess("操作成功");
-      //     this.getList();
-      //   });
-      // });
     },
     handleSubmit() {
       if (this.isAdd) {
         API.afterSalesAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addAfterSales.loading = false;
             this.open = false;
             this.getList();
@@ -188,18 +178,6 @@ export default {
       }
     },
 
-    handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
-        type: "warning",
-      }).then(() => {
-        API.orderDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
-          this.getList();
-        });
-      });
-    },
     showAddress(row) {
       return (
         <div>
@@ -234,44 +212,66 @@ export default {
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
           label="售后类型"
-          align="center"
+          align="left"
+          width="120"
           :formatter="(row) => dictDataEcho(row.type, afterSalesTypeList)"
         />
-        <el-table-column label="订单编号" align="center" prop="code" />
-        <el-table-column label="客户名称" align="center" prop="customerName" />
-        <el-table-column label="订单金额" align="center" prop="amountMoney" />
+        <el-table-column label="订单编号" align="left" prop="code">
+          <template slot-scope="scope">
+            <div
+              style="
+                color: #0084ff;
+                cursor: pointer;
+                text-decoration: underline;
+              "
+            >
+              {{ scope.row.code }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
-          label="收件城市"
-          align="center"
-          :formatter="showAddress"
+          label="客户名称"
+          align="left"
+          prop="customerName"
+          width="130"
         />
         <el-table-column
-          label="详细地址"
-          align="center"
-          prop="detailedAddress"
+          label="订单金额"
+          align="left"
+          prop="amountMoney"
+          width="140"
+        />
+        <el-table-column
+          label="收件城市"
+          align="left"
+          width="150"
+          :formatter="showAddress"
         />
+        <el-table-column label="详细地址" align="left" prop="detailedAddress" />
         <el-table-column
           label="下单时间"
-          align="center"
+          align="left"
           prop="orderTime"
           width="150"
         />
         <el-table-column
           label="登记时间"
-          align="center"
+          align="left"
           prop="createTime"
           width="150"
         />
         <el-table-column
           label="状态"
-          align="center"
+          align="left"
+          width="120"
           :formatter="
             (row) => dictDataEcho(row.afterSalesStatus, afterSalesStatusList)
           "
         />
         <el-table-column
           label="订单状态"
-          align="center"
+          align="left"
+          width="120"
           :formatter="(row) => dictDataEcho(row.status, orderStatusList)"
         />
         <el-table-column label="操作" align="center" width="120">
@@ -322,7 +322,7 @@ export default {
   .header {
     // height: 100px;
     margin-bottom: 10px;
-    box-sizing: border_management-box;
+    box-sizing: border-box;
   }
   .body-main {
     flex: 1;

src/views/order-management/order/JDorder.vue

@@ -23,7 +23,7 @@ export default {
         otherButton: {
           list: [
             {
-              name: this.$t("order_management.order.orderAdd"),
+              name: "添加订单",
               methodsText: "add",
               type: "primary",
               add: () => {
@@ -137,26 +137,12 @@ export default {
       });
     },
     handleCancel() {
-      this.form = {
-        money: "",
-        customerInfoId: "",
-        type: "",
-        countryId: "China",
-        provinceId: "",
-        cityId: "",
-        detailedAddress: "",
-        contacts: "",
-        phone: "",
-        phonePrefixType: "",
-        remark: "",
-        orderDetailsList: [],
-      };
       this.open = false;
     },
     handleChangeStatus(row, status) {
       this.$confirm("是否确认进行该操作", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.orderEdit({ id: row.id, status }).then(() => {
@@ -168,7 +154,7 @@ export default {
     handleSubmit() {
       API.JDorderAdd(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addOrder.loading = false;
           this.open = false;
           this.getList();
@@ -178,51 +164,13 @@ export default {
           this.$refs.addOrder.loading = false;
         }
       );
-      // if (!this.form.id) {
-      //   API.JDorderAdd(this.form).then(
-      //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
-      //       this.$refs.addOrder.loading = false;
-      //       this.open = false;
-      //       this.getList();
-      //     },
-      //     (err) => {
-      //       console.log("JDorderAdd: " + err);
-      //       this.$refs.addOrder.loading = false;
-      //     }
-      //   );
-      // } else {
-      //   API.JDorderEdit(this.form).then(
-      //     () => {
-      //       this.msgSuccess(this.$t("editSuccess"));
-      //       this.open = false;
-      //       this.$refs.addOrder.loading = false;
-      //       this.getList();
-      //     },
-      //     (err) => {
-      //       console.log("JDorderEdit: " + err);
-      //       this.$refs.addOrder.loading = false;
-      //     }
-      //   );
-      // }
     },
 
-    handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
-        type: "warning",
-      }).then(() => {
-        API.orderDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
-          this.getList();
-        });
-      });
-    },
     showAddress(row) {
       return (
         <div>
-          {row.countryName} , {row.provinceName} , {row.cityName}
+          {row.countryName} , {row.provinceName} , {row.cityName} ,{" "}
+          {row.detailedAddress}
         </div>
       );
     },
@@ -256,39 +204,50 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
+        <el-table-column label="订单编号" align="left" prop="code" width="150">
+          <template slot-scope="scope">
+            <div
+              style="
+                color: #0084ff;
+                cursor: pointer;
+                text-decoration: underline;
+              "
+            >
+              {{ scope.row.code }}
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
-          :label="$t('order_management.order.orderCode')"
-          align="center"
-          prop="code"
-        />
-        <el-table-column
-          :label="$t('order_management.order.customerName')"
-          align="center"
+          label="客户名称"
+          align="left"
           prop="customerName"
           :formatter="(row) => '京东'"
         />
         <el-table-column
-          :label="$t('order_management.order.orderAmount')"
-          align="center"
+          label="订单金额"
+          align="left"
           prop="amountMoney"
+          width="140"
         />
         <el-table-column
-          :label="$t('order_management.order.recipientCity')"
-          align="center"
+          label="收件城市"
+          align="left"
           :formatter="showAddress"
         />
         <el-table-column
-          :label="$t('order_management.order.orderTime')"
-          align="center"
+          label="下单时间"
+          align="left"
           prop="orderTime"
+          width="160"
         />
         <el-table-column
-          :label="$t('order_management.order.orderStatus')"
-          align="center"
+          label="订单状态"
+          align="left"
+          width="110"
           :formatter="(row) => dictDataEcho(row.status, orderStatusList)"
         />
 
-        <!-- <el-table-column :label="$t('operation')" align="center" width="120">
+        <!-- <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -315,11 +274,7 @@ export default {
     </el-card>
 
     <el-dialog
-      :title="
-        titleText === 'add'
-          ? $t('order_management.order.orderAdd')
-          : $t('order_management.order.orderEdit')
-      "
+      :title="titleText === 'add' ? '添加订单' : '编辑订单'"
       :visible.sync="open"
       v-if="open"
       width="80%"
@@ -347,7 +302,7 @@ export default {
   .header {
     // height: 100px;
     margin-bottom: 10px;
-    box-sizing: border_management-box;
+    box-sizing: border-box;
   }
   .body-main {
     flex: 1;

src/views/order-management/order/addOrder.vue

@@ -28,13 +28,10 @@
 
         <el-row :gutter="10" v-else>
           <el-col :span="12">
-            <el-form-item
-              :label="$t('order_management.order.customerName')"
-              prop="customerInfoId"
-            >
+            <el-form-item label="客户名称" prop="customerInfoId">
               <el-select
                 v-model="form.customerInfoId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -48,13 +45,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <el-form-item
-              :label="$t('order_management.order.orderType')"
-              prop="type"
-            >
+            <el-form-item label="订单类型" prop="type">
               <el-select
                 v-model="form.type"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -69,35 +63,17 @@
           </el-col>
         </el-row>
 
-        <div style="margin-bottom: 20px">
-          <labelTitle
-            :content="$t('order_management.order.orderDetails')"
-          ></labelTitle>
+        <div style="margin-top: 20px">
+          <labelTitle content="订单明细"></labelTitle>
         </div>
         <el-form-item label-width="0px">
-          <el-button @click="selectDialog = true">
-            {{ $t("select") }}</el-button
-          >
+          <el-button size="mini" @click="selectDialog = true"> 选择</el-button>
         </el-form-item>
         <el-form-item>
           <el-table :data="form.orderDetailsList" v-if="JDorder">
-            <el-table-column
-              :label="$t('order_management.order.productCode')"
-              prop="code"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('order_management.order.productName')"
-              prop="name"
-            >
-            </el-table-column>
-
-            <el-table-column
-              :label="$t('order_management.order.price')"
-              prop="price"
-            >
-            </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="price"> </el-table-column>
             <el-table-column label="数量" prop="quantity">
               <template slot-scope="scope">
                 <el-form-item
@@ -108,7 +84,7 @@
                 >
                   <el-input-number
                     v-model="scope.row.quantity"
-                    :label="$t('pleaseInput')"
+                    label="请输入"
                     style="width: 100%"
                     size="mini"
                     @change="totalAmount"
@@ -121,11 +97,25 @@
               </template>
             </el-table-column>
             <el-table-column label="小计" prop="subtotal"> </el-table-column>
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="备注" prop="remark">
+              <template slot-scope="scope">
+                <el-form-item
+                  :prop="'orderDetailsList.' + scope.$index + '.remark'"
+                  :rules="formRules.remark"
+                  :inline-message="true"
+                  label-width="0"
+                >
+                  <el-input
+                    v-model="scope.row.remark"
+                    placeholder="请输入"
+                    style="width: 100%"
+                    size="mini"
+                  >
+                  </el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" align="center">
               <template slot-scope="scope">
                 <el-button type="text" @click="deleteRow(scope.$index)">{{
                   $t("delete")
@@ -134,23 +124,9 @@
             </el-table-column>
           </el-table>
           <el-table :data="form.orderDetailsList" v-else>
-            <el-table-column
-              :label="$t('order_management.order.productCode')"
-              prop="code"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('order_management.order.productName')"
-              prop="name"
-            >
-            </el-table-column>
-
-            <el-table-column
-              :label="$t('order_management.order.price')"
-              prop="price"
-            >
-            </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="price"> </el-table-column>
             <el-table-column label="数量" prop="quantity">
               <template slot-scope="scope">
                 <el-form-item
@@ -161,7 +137,7 @@
                 >
                   <el-input-number
                     v-model="scope.row.quantity"
-                    :label="$t('pleaseInput')"
+                    label="请输入"
                     style="width: 100%"
                     size="mini"
                     @change="totalAmount"
@@ -174,15 +150,29 @@
               </template>
             </el-table-column>
             <el-table-column label="小计" prop="subtotal"> </el-table-column>
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="备注" prop="remark">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-form-item
+                  :prop="'orderDetailsList.' + scope.$index + '.remark'"
+                  :rules="formRules.remark"
+                  :inline-message="true"
+                  label-width="0"
+                >
+                  <el-input
+                    v-model="scope.row.remark"
+                    placeholder="请输入"
+                    style="width: 100%"
+                    size="mini"
+                  >
+                  </el-input>
+                </el-form-item>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" width="100" align="center">
+              <template slot-scope="scope">
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -190,45 +180,31 @@
 
         <el-row>
           <el-col :span="4">
-            <el-form-item
-              :label="$t('order_management.order.orderAmount')"
-              prop="code"
-            >
+            <el-form-item label="订单金额" prop="code">
               <el-input
                 v-model="form.money"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 disabled
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <div style="margin-bottom: 20px">
-          <labelTitle
-            :content="$t('order_management.order.harvestInfo')"
-          ></labelTitle>
+        <div style="margin-top: 20px">
+          <labelTitle content="收货信息"></labelTitle>
         </div>
 
-        <el-form-item
-          :label="$t('order_management.order.contactInfo')"
-          required
-        >
+        <el-form-item label="收件人" required>
           <el-row :gutter="10">
             <el-col :span="4">
               <el-form-item label-width="0" prop="contacts">
-                <el-input
-                  v-model="form.contacts"
-                  :placeholder="$t('order_management.order.contacts')"
-                >
+                <el-input v-model="form.contacts" placeholder="联系人">
                 </el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label-width="0" prop="phone">
-                <el-input
-                  v-model="form.phone"
-                  :placeholder="$t('order_management.order.contactNumber')"
-                >
+                <el-input v-model="form.phone" placeholder="联系电话">
                   <template>
                     <div slot="prepend">+ 86</div>
                   </template>
@@ -238,13 +214,13 @@
           </el-row>
         </el-form-item>
 
-        <el-form-item :label="$t('order_management.order.address')" required>
+        <el-form-item label="收件地址" required>
           <el-row :gutter="10">
             <el-col :span="4">
               <el-form-item label-width="0" prop="countryId">
                 <el-select
                   v-model="form.countryId"
-                  :placeholder="$t('order_management.order.country')"
+                  placeholder="国家"
                   style="width: 100%"
                   @change="countryChange"
                 >
@@ -262,7 +238,7 @@
               <el-form-item label-width="0" prop="provinceId">
                 <el-select
                   v-model="form.provinceId"
-                  :placeholder="$t('order_management.order.province')"
+                  placeholder="省/洲"
                   style="width: 100%"
                   @change="provinceChange"
                   :disabled="!provinceData.length > 0"
@@ -281,7 +257,7 @@
               <el-form-item label-width="0" prop="cityId">
                 <el-select
                   v-model="form.cityId"
-                  :placeholder="$t('order_management.order.city')"
+                  placeholder="城市"
                   style="width: 100%"
                   :disabled="!provinceData.length > 0 && !cityData.length > 0"
                 >
@@ -308,11 +284,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
     <el-dialog
@@ -335,7 +309,7 @@ import labelTitle from "@/components/label-title/index.vue";
 import selectProduct from "@/components/select-product/index.vue";
 
 export default {
-  name: "addCustomer",
+  name: "addOrder",
   components: {
     labelTitle,
     selectProduct,
@@ -380,63 +354,43 @@ export default {
         type: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("order_management.order.orderType"),
+            message: "请选择订单类型",
             trigger: "change",
           },
         ],
         countryId: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("order_management.order.country"),
+            message: "请选择国家",
             trigger: "change",
           },
         ],
         provinceId: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("order_management.order.province"),
+            message: "请选择省/洲",
             trigger: "change",
           },
         ],
         cityId: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") + this.$t("order_management.order.city"),
+            message: "请选择城市",
             trigger: "change",
           },
         ],
 
-        name: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("order_management.order.orderName"),
-            trigger: "blur",
-          },
-        ],
         contacts: [
           {
             required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("order_management.order.contacts"),
+            message: "请输入联系人",
             trigger: "blur",
           },
         ],
         phone: [
           {
             required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("order_management.order.contactNumber"),
+            message: "请输入联系电话",
             trigger: "blur",
           },
         ],
@@ -522,7 +476,7 @@ export default {
           remark: "",
         });
       }
-      this.msgSuccess(this.$t("addSuccess"));
+      this.msgSuccess("添加成功");
     },
     deleteRow(index) {
       if (this.JDorder) {

src/views/order-management/order/index.vue

@@ -26,7 +26,7 @@ export default {
         otherButton: {
           list: [
             {
-              name: this.$t("order_management.order.orderAdd"),
+              name: "添加订单",
               methodsText: "add",
               type: "primary",
               add: () => {
@@ -48,7 +48,7 @@ export default {
       },
       selectConfig: [
         {
-          label: this.$t("order_management.order.orderType"),
+          label: "订单类型",
           prop: "type",
           data: [],
         },
@@ -160,8 +160,8 @@ export default {
     },
     handleChangeStatus(row, status) {
       this.$confirm("是否确认进行该操作", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.orderEdit({ id: row.id, status }).then(() => {
@@ -174,7 +174,7 @@ export default {
       if (!this.form.id) {
         API.orderAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addOrder.loading = false;
             this.open = false;
             this.getList();
@@ -187,7 +187,7 @@ export default {
       } else {
         API.orderEdit(this.form).then(
           () => {
-            this.msgSuccess(this.$t("editSuccess"));
+            this.msgSuccess("编辑成功");
             this.open = false;
             this.$refs.addOrder.loading = false;
             this.getList();
@@ -200,18 +200,6 @@ export default {
       }
     },
 
-    handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
-        type: "warning",
-      }).then(() => {
-        API.orderDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
-          this.getList();
-        });
-      });
-    },
     showAddress(row) {
       return (
         <div>
@@ -243,42 +231,50 @@ export default {
       ></query>
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
-          :label="$t('order_management.order.orderType')"
-          align="center"
+          label="订单类型"
+          align="left"
+          width="100"
           :formatter="(row) => dictDataEcho(row.type, orderTypeList)"
         />
+        <el-table-column label="订单编号" align="left" prop="code" width="140">
+          <template slot-scope="scope">
+            <div
+              style="
+                color: #0084ff;
+                cursor: pointer;
+                text-decoration: underline;
+              "
+            >
+              {{ scope.row.code }}
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column label="客户名称" align="left" prop="customerName" />
         <el-table-column
-          :label="$t('order_management.order.orderCode')"
-          align="center"
-          prop="code"
-        />
-        <el-table-column
-          :label="$t('order_management.order.customerName')"
-          align="center"
-          prop="customerName"
-        />
-        <el-table-column
-          :label="$t('order_management.order.orderAmount')"
-          align="center"
+          label="订单金额"
+          align="left"
           prop="amountMoney"
+          width="140"
         />
         <el-table-column
-          :label="$t('order_management.order.recipientCity')"
-          align="center"
+          label="收件城市"
+          align="left"
           :formatter="showAddress"
         />
         <el-table-column
-          :label="$t('order_management.order.orderTime')"
-          align="center"
+          label="下单时间"
+          align="left"
           prop="orderTime"
+          width="160"
         />
         <el-table-column
-          :label="$t('order_management.order.orderStatus')"
-          align="center"
+          label="订单状态"
+          align="left"
+          width="110"
           :formatter="(row) => dictDataEcho(row.status, orderStatusList)"
         />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -305,11 +301,7 @@ export default {
     </el-card>
 
     <el-dialog
-      :title="
-        titleText === 'add'
-          ? $t('order_management.order.orderAdd')
-          : $t('order_management.order.orderEdit')
-      "
+      :title="titleText === 'add' ? '添加订单' : '编辑订单'"
       :visible.sync="open"
       v-if="open"
       width="80%"
@@ -337,7 +329,7 @@ export default {
   .header {
     // height: 100px;
     margin-bottom: 10px;
-    box-sizing: border_management-box;
+    box-sizing: border-box;
   }
   .body-main {
     flex: 1;

src/views/product-material/spu/addSpu.vue

@@ -49,7 +49,9 @@
             </el-table-column>
             <el-table-column label="操作" width="100" align="center">
               <template slot-scope="scope">
-                <el-button type="text">删除</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -134,6 +136,10 @@ export default {
       });
       this.msgSuccess("添加成功");
     },
+    deleteRow(index) {
+      this.form.productIdList.splice(index, 1);
+      this.msgSuccess("删除成功");
+    },
   },
 };
 </script>

src/views/product-material/spu/index.vue

@@ -9,7 +9,15 @@
     ></query>
 
     <el-table :data="tableList" v-loading="loading">
-      <el-table-column label="spu编码" align="left" prop="code" width="150" />
+      <el-table-column label="spu编码" align="left" prop="code" width="150">
+        <template slot-scope="scope">
+          <div
+            style="color: #0084ff; cursor: pointer; text-decoration: underline"
+          >
+            {{ scope.row.code }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="spu名称" align="left" prop="name" width="180" />
       <el-table-column label="spu说明" align="left" prop="remark" />
 
@@ -55,6 +63,8 @@ import test from "@/components/form-test/index.vue";
 import addSpu from "./addSpu.vue";
 import query from "@/components/query/index.vue";
 import * as API from "@/api/product-material/spu/index.js";
+import { productList } from "@/api/product-material/product/index.js";
+
 export default {
   components: {
     test,
@@ -100,22 +110,26 @@ export default {
   methods: {
     handleEdit(row) {
       this.titleText = "edit";
-      this.form = row;
-      this.form.productIdList = [];
       this.open = true;
-      // this.$nextTick(() => {
-      //   this.$refs.addSpu.loading = true;
-      //   API.spuEdit({ id: row.id }).then(
-      //     (res) => {
-      //       this.form = res.data.data;
-      //       this.$refs.addSpu.loading = false;
-      //     },
-      //     (err) => {
-      //       console.log("spuEdit: " + err);
-      //       this.$refs.addSpu.loading = false;
-      //     }
-      //   );
-      // });
+      this.$nextTick(() => {
+        this.$refs.addSpu.loading = true;
+        productList({ productSpuId: row.id }).then(
+          (res) => {
+            const list = res.data.data.records.map((x) => ({
+              productCode: x.code,
+              productName: x.name,
+              productId: x.id,
+            }));
+            this.form = row;
+            this.form.productIdList = list;
+            this.$refs.addSpu.loading = false;
+          },
+          (err) => {
+            console.log("productList: " + err);
+            this.$refs.addSpu.loading = false;
+          }
+        );
+      });
     },
     getList() {
       this.loading = true;

src/views/product-material/supply/priceMaintenance.vue

@@ -18,8 +18,9 @@
         <el-table-column
           label="供应商类型"
           align="left"
-          prop="supplierId"
+          prop="type"
           width="140"
+          :formatter="(row) => dictDataEcho(row.type, supplyTypeList)"
         />
         <el-table-column label="供应商名称" align="left" prop="supplierName" />
         <el-table-column
@@ -244,7 +245,7 @@ export default {
         },
         {
           label: "供应商类型",
-          prop: "supplierId",
+          prop: "type",
           data: [],
         },
       ],

src/views/purchase-management/deliver-goods/index.vue

@@ -18,28 +18,7 @@ export default {
       productTypeList: [],
       supplySelectList: [],
       supplyTypeList: [],
-      btnForm: {
-        otherButton: {
-          list: [
-            {
-              name: this.$t("purchase_management.purchase.purchase"),
-              methodsText: "add",
-              type: "primary",
-              add: () => {
-                this.handlePurchases();
-              },
-            },
-            {
-              name: this.$t("purchase_management.purchase.deliverGoods"),
-              methodsText: "deliverGoods",
-              type: "primary",
-              deliverGoods: () => {
-                this.deliverGoods();
-              },
-            },
-          ],
-        },
-      },
+
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -171,7 +150,7 @@ export default {
     handleSubmit() {
       API.deliveryNotice(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.sendGoods.loading = false;
           this.open = false;
           this.getList();
@@ -186,37 +165,37 @@ export default {
     handleArrive(row) {
       this.titleText = "到货通知";
       this.openArrive = true;
-      // this.$confirm(this.$t("askDeleteData"), {
-      //   confirmButtonText: this.$t("submitText"),
-      //   cancelButtonText: this.$t("cancelText"),
+      // this.$confirm('是否确认此操作 ?', {
+      //   confirmButtonText: '确定',
+      //   cancelButtonText: '取消',
       //   type: "warning",
       // }).then(() => {
       //   API.completePurchase({ id: row.id }).then(() => {
-      //     this.msgSuccess(this.$t("deleteSuccess"));
+      //     this.msgSuccess('删除成功');
       //     this.getList();
       //   });
       // });
     },
     handlePurchaseEnd(row) {
       this.$confirm("是否确定此操作 ？", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.purchaseEnd({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("操作成功");
           this.getList();
         });
       });
     },
     handlePurchaseCancel(row) {
       this.$confirm("是否确定此操作 ？", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.purchaseCancel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("操作成功");
           this.getList();
         });
       });
@@ -234,11 +213,6 @@ export default {
     },
     handleCancel1() {
       this.openArrive = false;
-      this.arriveForm = {
-        id: "",
-        name: "",
-        code: "",
-      };
     },
     isSelectable(row) {
       if (row.status != 30) {
@@ -264,7 +238,7 @@ export default {
     <el-card class="box-card">
       <query
         :selectConfig="selectConfig"
-        :req=" queryParams"
+        :req="queryParams"
         :isShowMore="false"
         @handleQuery="handleQuery"
         @handleMore="
@@ -273,45 +247,57 @@ export default {
           }
         "
       ></query>
-      <el-table
-        :data="tableList"
-        v-loading="loading"
-      >
-   
+      <el-table :data="tableList" v-loading="loading">
+        <el-table-column label="采购单号" align="left" prop="code" width="150">
+          <template slot-scope="scope">
+            <div
+              style="
+                color: #0084ff;
+                cursor: pointer;
+                text-decoration: underline;
+              "
+            >
+              {{ scope.row.code }}
+            </div>
+          </template>
         </el-table-column>
+        <el-table-column label="供应商" align="left" prop="price" />
         <el-table-column
-          label="采购单号"
-          align="center"
-          prop="code"
-          width="150"
-        >
-  
-        </el-table-column>
-        <el-table-column label="供应商" align="center" prop="price" />
-
-        <el-table-column label="采购总金额" align="center" prop="price" />
-        <el-table-column label="采购员" align="center" prop="createName" />
-
+          label="采购总金额"
+          align="left"
+          prop="price"
+          width="140"
+        />
+        <el-table-column
+          label="采购员"
+          align="left"
+          prop="createName"
+          width="120"
+        />
         <el-table-column
           label="采购时间"
-          align="center"
+          align="left"
           prop="createTime"
           width="160"
         />
         <el-table-column
           label="状态"
-          align="center"
+          align="left"
+          width="120"
           :formatter="(row) => dictDataEcho(row.status, purchaseStatusList)"
         />
-        <el-table-column label="付款状态" align="center" prop="createName" />
-
-        <el-table-column :label="$t('operation')" align="center" width="240">
-          <!-- v-if="scope.row.status === 30" -->
+        <el-table-column
+          label="付款状态"
+          align="left"
+          prop="createName"
+          width="120"
+        />
+        <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleSend(scope.row)"
-              >  发货通知
+            <el-button type="text" @click="handleSend(scope.row)">
+              发货通知
             </el-button>
-            <el-button type="text"   @click="handleArrive(scope.row)"
+            <el-button type="text" @click="handleArrive(scope.row)"
               >到货通知
             </el-button>
             <el-button type="text" @click="handlePurchaseEnd(scope.row)"
@@ -325,13 +311,12 @@ export default {
       </el-table>
     </el-card>
 
-    <el-dialog 
+    <el-dialog
       :title="titleText"
       :visible.sync="open"
       v-if="open"
       width="80%"
-
-          top="60px"
+      top="60px"
     >
       <send-goods
         :form="form"
@@ -340,45 +325,45 @@ export default {
         ref="sendGoods"
       ></send-goods>
     </el-dialog>
-      
-    <el-dialog   title="到货通知"
+
+    <el-dialog
+      title="到货通知"
       :visible.sync="openArrive"
       v-if="openArrive"
       width="30%"
-
-          top="60px">
-         <el-form
+      top="60px"
+    >
+      <el-form
         label-position="top"
         :model="arriveForm"
         ref="arriveForm"
         :rules="arriveFormRules"
         label-width="100px"
       >
-        <el-row >
+        <el-row>
           <el-col :span="8">
             <el-form-item label="采购单号" prop="code">
               <el-input
                 v-model="arriveForm.code"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 disabled
               ></el-input>
             </el-form-item>
           </el-col>
-       
         </el-row>
-           <el-form-item label="供应商" prop="name">
-              <el-input
-                v-model="arriveForm.name"
-                :placeholder="$t('pleaseInput')"
-                disabled
-              ></el-input>
-            </el-form-item>
-        <el-row >
+        <el-form-item label="供应商" prop="name">
+          <el-input
+            v-model="arriveForm.name"
+            placeholder="请输入"
+            disabled
+          ></el-input>
+        </el-form-item>
+        <el-row>
           <el-col :span="8">
             <el-form-item label="物流/快递单号" prop="id">
               <el-select
                 v-model="arriveForm.id"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -391,27 +376,16 @@ export default {
               </el-select>
             </el-form-item>
           </el-col>
-   
         </el-row>
-      
-
       </el-form>
- 
-    <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel1"
-        >{{ $t("cancel") }}
-      </el-button>
-      <el-button type="primary" size="small" @click="handleSubmit1">
-        {{ $t("submit") }}</el-button
-      >
-    </div>
-    </el-dialog>
-
-
-
-
-    
 
+      <div style="text-align: center; margin-top: 15px">
+        <el-button size="small" @click="handleCancel1">取消 </el-button>
+        <el-button type="primary" size="small" @click="handleSubmit1">
+          确定</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 

src/views/purchase-management/deliver-goods/sendGoods.vue

@@ -13,7 +13,7 @@
             <el-form-item label="采购单号" prop="code">
               <el-input
                 v-model="form.code"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 disabled
               ></el-input>
             </el-form-item>
@@ -22,7 +22,7 @@
             <el-form-item label="供应商" prop="code">
               <el-input
                 v-model="form.code"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 disabled
               ></el-input>
             </el-form-item>
@@ -33,7 +33,7 @@
             <el-form-item label="物流信息" prop="logisticsCompanyCode">
               <el-select
                 v-model="form.logisticsCompanyCode"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -75,21 +75,12 @@
 
         <el-form-item>
           <el-table :data="form.details">
-            <el-table-column
-              :label="$t('purchase_management.purchase.goodCode')"
-              prop="goodsCode"
-            >
+            <el-table-column label="物品编码" prop="goodsCode">
             </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.purchase.goodName')"
-              prop="goodsName"
-            >
+            <el-table-column label="物品名称" prop="goodsName">
             </el-table-column>
 
-            <el-table-column
-              :label="$t('purchase_management.purchase.subscribeQuantity')"
-              prop="quantity"
-            >
+            <el-table-column label="采购数量" prop="quantity">
             </el-table-column>
 
             <el-table-column label="发货数量" prop="shipmentQuantity">
@@ -102,7 +93,7 @@
                 >
                   <el-input
                     v-model="scope.row.shipmentQuantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -114,11 +105,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>

src/views/purchase-management/purchase/addPurchase.vue

@@ -10,13 +10,10 @@
       >
         <el-row>
           <el-col :span="8">
-            <el-form-item
-              :label="$t('purchase_management.purchase.selectSupply')"
-              prop="supplieId"
-            >
+            <el-form-item label="供应商" prop="supplieId">
               <el-select
                 v-model="form.supplieId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -34,33 +31,12 @@
           </el-col>
         </el-row>
 
-        <!-- <el-row>
-          <el-col :span="8">
-            <el-form-item
-              :label="$t('purchase_management.purchase.askArrivalTime')"
-              prop="planArrivalTime"
-            >
-              <el-date-picker
-                v-model="form.planArrivalTime"
-                type="datetime"
-                :placeholder="$t('pleaseSelect')"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                style="width: 100%"
-              >
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-        </el-row> -->
-
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              :label="$t('purchase_management.purchase.remarks')"
-              prop="flowRemark"
-            >
+            <el-form-item label="备注" prop="flowRemark">
               <el-input
                 v-model="form.flowRemark"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 type="textarea"
                 rows="4"
               ></el-input>
@@ -68,47 +44,28 @@
           </el-col>
         </el-row>
 
-        <div style="margin-bottom: 20px">
-          <labelTitle
-            :content="$t('purchase_management.purchase.subscribeDetails')"
-          ></labelTitle>
+        <div style="margin-bottom: 10px">
+          <labelTitle content="采购明细"></labelTitle>
         </div>
 
         <el-form-item>
           <el-table :data="form.goodsList">
-            <el-table-column
-              :label="$t('purchase_management.purchase.goodCode')"
-              prop="goodsCode"
-            >
+            <el-table-column label="物品编码" prop="goodsCode">
             </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.purchase.goodName')"
-              prop="goodsName"
-            >
+            <el-table-column label="物品名称" prop="goodsName">
             </el-table-column>
             <el-table-column
-              :label="$t('purchase_management.purchase.goodType')"
+              label="物品类型"
               prop="goodType"
               :formatter="(row) => dictDataEcho(row.goodsType, productTypeList)"
             >
             </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.purchase.unit')"
-              prop="goodsUnit"
-            >
-            </el-table-column>
-            <!-- <el-table-column
-              :label="$t('purchase_management.purchase.subscribeQuantity')"
-              prop="quantity"
-            >
-            </el-table-column> -->
+            <el-table-column label="单位" prop="goodsUnit"> </el-table-column>
+
             <el-table-column label="采购数量" prop="quantity">
             </el-table-column>
 
-            <el-table-column
-              :label="$t('purchase_management.purchase.price')"
-              prop="price"
-            >
+            <el-table-column label="单价" prop="price">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'goodsList.' + scope.$index + '.price'"
@@ -118,7 +75,7 @@
                 >
                   <el-input
                     v-model="scope.row.unitPrice"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -128,15 +85,11 @@
             <el-table-column label="小计" prop="stockQuantity">
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -144,11 +97,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>
@@ -192,81 +143,14 @@ export default {
         supplieId: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.selectSupply"),
-            trigger: "change",
-          },
-        ],
-        planArrivalTime: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.askArrivalTime"),
-            trigger: "change",
-          },
-        ],
-        countryId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.country"),
+            message: "请选择供应商",
             trigger: "change",
           },
         ],
-        provinceId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.province"),
-            trigger: "change",
-          },
-        ],
-        cityId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.city"),
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.purchase.purchaseType"),
-            trigger: "change",
-          },
-        ],
-        name: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.purchase.purchaseName"),
-            trigger: "blur",
-          },
-        ],
-        contacts: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.purchase.contacts"),
-            trigger: "blur",
-          },
-        ],
-        phone: [
+        price: [
           {
             required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.purchase.contactNumber"),
+            message: "请输入单价",
             trigger: "blur",
           },
         ],

src/views/purchase-management/purchase/index.vue

@@ -52,12 +52,12 @@ export default {
       },
       selectConfig: [
         {
-          label: this.$t("purchase_management.purchase.purchaseStatus"),
-          prop: "type",
+          label: "采购状态",
+          prop: "status",
           data: [],
         },
         {
-          label: this.$t("purchase_management.purchase.goodType"),
+          label: "物品类型",
           prop: "type",
           data: [],
         },
@@ -194,7 +194,7 @@ export default {
       if (!this.form.id) {
         API.sendPurchase(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.sendSubscribe.loading = false;
             this.open = false;
             this.getList();
@@ -207,7 +207,7 @@ export default {
       } else {
         API.purchaseEdit(this.form).then(
           () => {
-            this.msgSuccess(this.$t("editSuccess"));
+            this.msgSuccess("编辑成功");
             this.open = false;
             this.$refs.sendSubscribe.loading = false;
             this.getList();
@@ -222,13 +222,13 @@ export default {
 
     handleDelete(row) {
       this.$confirm("你确定通过审批吗？", {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.purchaseApproval({ id: row.id, buttonId: "", flowRemark: "" }).then(
           () => {
-            this.msgSuccess(this.$t("deleteSuccess"));
+            this.msgSuccess("删除成功");
             this.getList();
           }
         );
@@ -278,89 +278,72 @@ export default {
         <el-table-column
           type="selection"
           width="50"
-          align="center"
+          align="left"
           :selectable="isSelectable"
         >
         </el-table-column>
-        <!-- <el-table-column
-          :label="$t('purchase_management.purchase.subscribeOddNumbers')"
-          align="center"
-          prop="code"
-          width="150"
-        /> -->
+
         <el-table-column
-          :label="$t('purchase_management.purchase.goodCode')"
-          align="center"
+          label="物品编码"
+          align="left"
           prop="goodsCode"
+          width="130"
         />
+        <el-table-column label="物品名称" align="left" prop="goodsName" />
         <el-table-column
-          :label="$t('purchase_management.purchase.goodName')"
-          align="center"
-          prop="goodsName"
-        />
-        <el-table-column
-          :label="$t('purchase_management.purchase.goodType')"
-          align="center"
+          label="物品类型"
+          align="left"
+          width="100"
           :formatter="(row) => dictDataEcho(row.goodsType, productTypeList)"
         />
         <el-table-column
-          :label="$t('purchase_management.purchase.unit')"
-          align="center"
+          label="单位"
+          align="left"
           prop="goodsUnit"
+          width="100"
         />
         <el-table-column
-          :label="$t('purchase_management.purchase.subscribeNums')"
-          align="center"
+          label="申购数量"
+          align="left"
           prop="quantity"
+          width="120"
         />
-        <el-table-column label="收货仓库" align="center" prop="quantity" />
-        <!-- <el-table-column
-          :label="$t('purchase_management.purchase.price')"
-          align="center"
-          prop="price"
-        /> -->
-        <!-- <el-table-column
-          :label="$t('purchase_management.purchase.totalAmount')"
-          align="center"
-          prop="phone"
-        /> -->
+        <el-table-column label="收货仓库" align="left" prop="warehouseName" />
+
         <el-table-column
-          :label="$t('purchase_management.purchase.askArrivalTime')"
-          align="center"
+          label="要求到货时间"
+          align="left"
           prop="planArrivalTime"
           width="160"
         />
-        <!-- <el-table-column
-          :label="$t('purchase_management.purchase.subscribeReason')"
-          align="center"
-          prop="cause"
-        /> -->
 
         <el-table-column
-          :label="$t('purchase_management.purchase.purchaseStatus')"
-          align="center"
+          label="采购状态"
+          align="left"
+          width="120"
           :formatter="(row) => dictDataEcho(row.status, purchaseStatusList)"
         />
 
         <el-table-column
-          :label="$t('purchase_management.purchase.subscribePeople')"
-          align="center"
+          label="申购人"
+          align="left"
           prop="createName"
+          width="120"
         />
         <el-table-column
           label="申购时间"
-          align="center"
+          align="left"
           prop="planArrivalTime"
           width="160"
         />
 
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"
               v-if="scope.row.status === 10"
               @click="handlePurchase(scope.row)"
-              >{{ $t("purchase_management.purchase.purchase") }}
+              >采购
             </el-button>
             <el-button
               type="text"
@@ -374,11 +357,7 @@ export default {
     </el-card>
 
     <el-dialog
-      :title="
-        titleText === 'add'
-          ? $t('purchase_management.purchase.purchase')
-          : $t('purchase_management.purchase.purchaseEdit')
-      "
+      :title="titleText === 'add' ? '开始采购' : 'aa'"
       :visible.sync="open"
       v-if="open"
       width="80%"

src/views/purchase-management/returnsManagement/addReturnsGoods.vue

@@ -81,7 +81,7 @@
                 >
                   <el-input
                     v-model="scope.row.unitPrice"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -93,11 +93,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
   </div>

src/views/purchase-management/returnsManagement/index.vue

@@ -136,7 +136,7 @@ export default {
       if (!this.form.id) {
         API.outboundAdd(this.form).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.addCustomer.loading = false;
             this.open = false;
             this.getList();
@@ -149,7 +149,7 @@ export default {
       } else {
         API.outboundEdit(this.form).then(
           () => {
-            this.msgSuccess(this.$t("editSuccess"));
+            this.msgSuccess("编辑成功");
             this.open = false;
             this.$refs.addCustomer.loading = false;
             this.getList();
@@ -163,13 +163,13 @@ export default {
     },
 
     handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+      this.$confirm("是否确认此操作 ?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -204,20 +204,20 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="退货单号" align="center" prop="code" />
+        <el-table-column label="退货单号" align="left" prop="code" />
 
-        <el-table-column label="采购单号" align="center" prop="code" />
-        <el-table-column label="供应商" align="center" prop="name" />
+        <el-table-column label="采购单号" align="left" prop="code" />
+        <el-table-column label="供应商" align="left" prop="name" />
         <el-table-column
           label="退货总金额"
-          align="center"
+          align="left"
           :formatter="showAddress"
         />
-        <el-table-column label="操作人" align="center" prop="contacts" />
-        <el-table-column label="操作时间" align="center" prop="phone" />
-        <el-table-column label="退款时间" align="center" prop="phone" />
+        <el-table-column label="操作人" align="left" prop="contacts" />
+        <el-table-column label="操作时间" align="left" prop="phone" />
+        <el-table-column label="退款时间" align="left" prop="phone" />
 
-        <el-table-column label="操作" align="center" width="120">
+        <el-table-column label="操作" align="left" width="120">
           <template slot-scope="scope">
             <el-button type="text" @click="handleEdit(scope.row)"
               >结束

src/views/purchase-management/settlement/purchaseSettlement.vue

@@ -131,7 +131,7 @@ export default {
     handleSubmit() {
       API.purchaseAdd(this.form).then(
         () => {
-          this.msgSuccess(this.$t("addSuccess"));
+          this.msgSuccess("添加成功");
           this.$refs.addInbound.loading = false;
           this.open = false;
           this.getList();
@@ -146,7 +146,7 @@ export default {
       // } else {
       //   API.manualAdd(this.form).then(
       //     () => {
-      //       this.msgSuccess(this.$t("addSuccess"));
+      //       this.msgSuccess('添加成功');
       //       this.open = false;
       //       this.$refs.addInbound.loading = false;
       //       this.getList();
@@ -160,13 +160,13 @@ export default {
     },
 
     handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+      this.$confirm("是否确认此操作 ?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.outboundDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -201,18 +201,18 @@ export default {
         "
       ></query>
       <el-table :data="tableList" v-loading="loading">
-        <el-table-column label="采购单号" align="center" prop="code" />
-        <el-table-column label="供应商编码" align="center" prop="name" />
-        <el-table-column label="供应商名称" align="center" />
-        <el-table-column label="采购金额" align="center" prop="contacts" />
-        <el-table-column label="已结算金额" align="center" prop="phone" />
-        <el-table-column label="未结算金额" align="center" prop="phone" />
-        <el-table-column label="结算时间" align="center" prop="phone" />
-        <el-table-column label="申请人" align="center" prop="phone" />
-        <el-table-column label="结算状态" align="center" prop="phone" />
-        <el-table-column label="备注" align="center" prop="phone" />
+        <el-table-column label="采购单号" align="left" prop="code" />
+        <el-table-column label="供应商编码" align="left" prop="name" />
+        <el-table-column label="供应商名称" align="left" />
+        <el-table-column label="采购金额" align="left" prop="contacts" />
+        <el-table-column label="已结算金额" align="left" prop="phone" />
+        <el-table-column label="未结算金额" align="left" prop="phone" />
+        <el-table-column label="结算时间" align="left" prop="phone" />
+        <el-table-column label="申请人" align="left" prop="phone" />
+        <el-table-column label="结算状态" align="left" prop="phone" />
+        <el-table-column label="备注" align="left" prop="phone" />
 
-        <!-- <el-table-column label="盘点详情" width="100" align="center">
+        <!-- <el-table-column label="盘点详情" width="100" align="left">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteRow(scope.$index)">{{
               $t("delete")

src/views/purchase-management/settlement/sendPurchaseSettlement.vue

@@ -55,11 +55,9 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
 

src/views/purchase-management/subscribe/index.vue

@@ -28,7 +28,7 @@ export default {
         otherButton: {
           list: [
             {
-              name: this.$t("purchase_management.subscribe.sendSubscribe"),
+              name: "发起申购",
               methodsText: "add",
               type: "primary",
               add: () => {
@@ -53,8 +53,8 @@ export default {
       },
       selectConfig: [
         {
-          label: this.$t("purchase_management.subscribe.subscribeStatus"),
-          prop: "type",
+          label: "申购状态",
+          prop: "status",
           data: [],
         },
       ],
@@ -127,13 +127,6 @@ export default {
       this.open = true;
     },
     handleCancel() {
-      this.form = {
-        id: "",
-        receiptWarehouseId: "",
-        planArrivalTime: "",
-        cause: "",
-        goodsId: [],
-      };
       this.open = false;
     },
     handleEdit(row) {
@@ -181,7 +174,7 @@ export default {
         });
         API.subscribeAdd(productList).then(
           () => {
-            this.msgSuccess(this.$t("addSuccess"));
+            this.msgSuccess("添加成功");
             this.$refs.sendSubscribe.loading = false;
             this.open = false;
             this.getList();
@@ -196,7 +189,7 @@ export default {
         this.form.goodsId = this.form.goodsId[0].goodsId;
         API.subscribeEdit(this.form).then(
           () => {
-            this.msgSuccess(this.$t("editSuccess"));
+            this.msgSuccess("编辑成功");
             this.open = false;
             this.$refs.sendSubscribe.loading = false;
             this.getList();
@@ -210,13 +203,13 @@ export default {
     },
 
     handleDelete(row) {
-      this.$confirm(this.$t("askDeleteData"), {
-        confirmButtonText: this.$t("submitText"),
-        cancelButtonText: this.$t("cancelText"),
+      this.$confirm("是否确认此操作 ?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
         type: "warning",
       }).then(() => {
         API.subscribeDel({ id: row.id }).then(() => {
-          this.msgSuccess(this.$t("deleteSuccess"));
+          this.msgSuccess("删除成功");
           this.getList();
         });
       });
@@ -252,85 +245,87 @@ export default {
       ></query>
       <el-table :data="tableList" v-loading="loading">
         <el-table-column
-          :label="$t('purchase_management.subscribe.subscribeOddNumbers')"
-          align="center"
+          label="申购单号"
+          align="left"
           prop="code"
           width="140"
         />
         <el-table-column
-          :label="$t('purchase_management.subscribe.goodCode')"
-          align="center"
+          label="物品编码"
+          align="left"
           prop="goodsCode"
+          width="120"
         />
+        <el-table-column label="物品名称" align="left" prop="goodsName" />
         <el-table-column
-          :label="$t('purchase_management.subscribe.goodName')"
-          align="center"
-          prop="goodsName"
-        />
-        <el-table-column
-          :label="$t('purchase_management.subscribe.goodType')"
-          align="center"
+          label="物品类型"
+          align="left"
+          width="100"
           :formatter="(row) => dictDataEcho(row.goodsType, productTypeList)"
         />
         <el-table-column
-          :label="$t('purchase_management.subscribe.unit')"
-          align="center"
+          label="单位"
+          align="left"
           prop="goodsUnit"
+          width="100"
         />
         <el-table-column
-          :label="$t('purchase_management.subscribe.subscribeNums')"
-          align="center"
+          label="申购数量"
+          align="left"
           prop="quantity"
+          width="120"
+        />
+        <el-table-column
+          label="申购人"
+          align="left"
+          prop="createName"
+          width="120"
+        />
+        <el-table-column
+          label="申购时间"
+          align="left"
+          prop="createTime"
+          width="160"
         />
         <el-table-column
-          :label="$t('purchase_management.subscribe.askArrivalTime')"
-          align="center"
+          label="要求到货时间"
+          align="left"
           prop="planArrivalTime"
           width="160"
         />
 
-        <el-table-column
+        <!-- <el-table-column
           :label="$t('purchase_management.subscribe.harvestWarehouse')"
-          align="center"
+          align="left"
           prop="warehouseName"
-        />
+        /> -->
 
-        <el-table-column
-          :label="$t('purchase_management.subscribe.subscribeDate')"
-          align="center"
-          prop="createTime"
-          width="160"
-        />
+        <!--        
         <el-table-column
           :label="$t('purchase_management.subscribe.subscribeReason')"
-          align="center"
+          align="left"
           prop="cause"
-        />
+        /> -->
         <el-table-column
-          :label="$t('purchase_management.subscribe.subscribeReason')"
-          align="center"
+          label="采购状态"
+          align="left"
+          width="120"
           :formatter="(row) => dictDataEcho(row.status, subscribeStatusList)"
         />
 
-        <el-table-column
-          :label="$t('purchase_management.subscribe.subscribePeople')"
-          align="center"
-          prop="createName"
-        />
-
-        <el-table-column :label="$t('operation')" align="center" width="120">
+        <el-table-column label="操作" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               type="text"
               v-if="scope.row.status === 10"
               @click="handleEdit(scope.row)"
-              >{{ $t("edit") }}
+              >编辑
             </el-button>
             <el-button
               type="text"
               v-if="scope.row.status === 10"
               @click="handleDelete(scope.row)"
-              >{{ $t("delete") }}
+              >删除
             </el-button>
           </template>
         </el-table-column>

src/views/purchase-management/subscribe/sendSubscribe.vue

@@ -8,18 +8,12 @@
         :rules="formRules"
         label-width="100px"
       >
-        <!-- <el-row>
-          <el-button type="primary">{{ $t("select") }}</el-button>
-        </el-row> -->
         <el-row>
           <el-col :span="8">
-            <el-form-item
-              :label="$t('purchase_management.subscribe.harvestWarehouse')"
-              prop="receiptWarehouseId"
-            >
+            <el-form-item label="收货仓库" prop="receiptWarehouseId">
               <el-select
                 v-model="form.receiptWarehouseId"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 style="width: 100%"
               >
                 <el-option
@@ -42,14 +36,11 @@
 
         <el-row>
           <el-col :span="8">
-            <el-form-item
-              :label="$t('purchase_management.subscribe.askArrivalTime')"
-              prop="planArrivalTime"
-            >
+            <el-form-item label="要求到货时间" prop="planArrivalTime">
               <el-date-picker
                 v-model="form.planArrivalTime"
                 type="datetime"
-                :placeholder="$t('pleaseSelect')"
+                placeholder="请选择"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 style="width: 100%"
               >
@@ -60,13 +51,10 @@
 
         <el-row>
           <el-col :span="12">
-            <el-form-item
-              :label="$t('purchase_management.subscribe.subscribeDescription')"
-              prop="cause"
-            >
+            <el-form-item label="申购说明" prop="cause">
               <el-input
                 v-model="form.cause"
-                :placeholder="$t('pleaseInput')"
+                placeholder="请输入"
                 type="textarea"
                 rows="4"
               ></el-input>
@@ -74,48 +62,27 @@
           </el-col>
         </el-row>
 
-        <div style="margin-bottom: 20px">
-          <labelTitle
-            :content="$t('purchase_management.subscribe.subscribeDetails')"
-          ></labelTitle>
+        <div style="margin-top: 20px">
+          <labelTitle content="申购明细"></labelTitle>
         </div>
         <el-form-item label-width="0px">
-          <el-button @click="selectDialog = true">
-            {{ $t("select") }}</el-button
+          <el-button size="mini" @click="selectDialog = true">
+            添加物品</el-button
           >
         </el-form-item>
         <el-form-item>
           <el-table :data="form.goodsId">
+            <el-table-column label="物品编码" prop="code"> </el-table-column>
+            <el-table-column label="物品名称" prop="name"> </el-table-column>
             <el-table-column
-              :label="$t('purchase_management.subscribe.goodCode')"
-              prop="code"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.subscribe.goodName')"
-              prop="name"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.subscribe.goodType')"
+              label="物品类型"
               prop="type"
               :formatter="(row) => dictDataEcho(row.type, productTypeList)"
             >
             </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.subscribe.unit')"
-              prop="unit"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.subscribe.stock')"
-              prop="stock"
-            >
-            </el-table-column>
-            <el-table-column
-              :label="$t('purchase_management.subscribe.subscribeQuantity')"
-              width="120"
-            >
+            <el-table-column label="单位" prop="unit"> </el-table-column>
+            <el-table-column label="库存" prop="stock"> </el-table-column>
+            <el-table-column label="申购数量" width="120">
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'goodsId.' + scope.$index + '.quantity'"
@@ -125,7 +92,7 @@
                 >
                   <el-input
                     v-model="scope.row.quantity"
-                    :placeholder="$t('pleaseInput')"
+                    placeholder="请输入"
                     size="mini"
                   >
                   </el-input>
@@ -133,15 +100,11 @@
               </template>
             </el-table-column>
 
-            <el-table-column
-              :label="$t('operation')"
-              width="100"
-              align="center"
-            >
+            <el-table-column label="操作" width="100" align="left">
               <template slot-scope="scope">
-                <el-button type="text" @click="deleteRow(scope.$index)">{{
-                  $t("delete")
-                }}</el-button>
+                <el-button type="text" @click="deleteRow(scope.$index)"
+                  >删除</el-button
+                >
               </template>
             </el-table-column>
           </el-table>
@@ -149,16 +112,14 @@
       </el-form>
     </div>
     <div style="text-align: center; margin-top: 15px">
-      <el-button size="small" @click="handleCancel"
-        >{{ $t("cancel") }}
-      </el-button>
+      <el-button size="small" @click="handleCancel">取消 </el-button>
       <el-button type="primary" size="small" @click="handleSubmit">
-        {{ $t("submit") }}</el-button
+        确定</el-button
       >
     </div>
 
     <el-dialog
-      :title="$t('goodsSelect')"
+      title="物品选择"
       v-if="selectDialog"
       :visible.sync="selectDialog"
       width="80%"
@@ -166,16 +127,6 @@
     >
       <selectProduct @select="handleSelect"></selectProduct>
     </el-dialog>
-
-    <!-- <el-dialog
-      :title="$t('goodsSelect')"
-      v-if="selectDialog"
-      :visible.sync="selectDialog"
-      width="80%"
-      top="60px"
-    >
-      <selectMaterial @select="handleSelect"></selectMaterial>
-    </el-dialog> -->
   </div>
 </template>
 
@@ -188,7 +139,7 @@ import selectGood from "@/components/select-good/index.vue";
 import { getToken } from "@/util/auth";
 
 export default {
-  name: "addCustomer",
+  name: "sendSubscribe",
   components: { labelTitle, selectProduct, selectMaterial, selectGood },
   props: {
     form: {
@@ -224,81 +175,22 @@ export default {
         receiptWarehouseId: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.harvestWarehouse"),
+            message: "请选择收货仓库",
             trigger: "change",
           },
         ],
         planArrivalTime: [
           {
             required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.askArrivalTime"),
+            message: "请选择要求到货时间",
             trigger: "change",
           },
         ],
-        countryId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.country"),
-            trigger: "change",
-          },
-        ],
-        provinceId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.province"),
-            trigger: "change",
-          },
-        ],
-        cityId: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.city"),
-            trigger: "change",
-          },
-        ],
-        type: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseSelect") +
-              this.$t("purchase_management.subscribe.subscribeType"),
-            trigger: "change",
-          },
-        ],
-        name: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.subscribe.subscribeName"),
-            trigger: "blur",
-          },
-        ],
-        contacts: [
-          {
-            required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.subscribe.contacts"),
-            trigger: "blur",
-          },
-        ],
+
         quantity: [
           {
             required: true,
-            message:
-              this.$t("pleaseInput") +
-              this.$t("purchase_management.subscribe.subscribeNums"),
+            message: "请输入申购数量",
             trigger: "blur",
           },
         ],
@@ -330,11 +222,11 @@ export default {
         unit: row.unit,
         stock: row.stockQuantity,
       });
-      this.msgSuccess(this.$t("addSuccess"));
+      this.msgSuccess("添加成功");
     },
     deleteRow(index) {
       this.form.goodsId.splice(index, 1);
-      this.msgSuccess(this.$t("deleteSuccess"));
+      this.msgSuccess("删除成功");
     },
   },
 };