dingdan

hb_client/src/api/sam.js

@@ -57,3 +57,33 @@ export function deleteContract(id, data) {
     data
   })
 }
+//订单
+//合同
+export function getOrderList(query) {
+  return request({
+    url: '/sam/order/',
+    method: 'get',
+    params: query
+  })
+}
+export function createOrder(data) {
+  return request({
+    url: '/sam/order/',
+    method: 'post',
+    data
+  })
+}
+export function updateOrder(id, data) {
+  return request({
+    url: `/sam/order/${id}/`,
+    method: 'put',
+    data
+  })
+}
+export function deleteOrder(id, data) {
+  return request({
+    url: `/sam/order/${id}/`,
+    method: 'delete',
+    data
+  })
+}

hb_client/src/router/index.js

@@ -175,6 +175,13 @@ export const asyncRoutes = [
         component: () => import('@/views/sam/contract'),
         meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
       }
+      ,
+      {
+        path: 'order',
+        name: 'order',
+        component: () => import('@/views/sam/order'),
+        meta: { title: '订单信息', icon: 'example', perms: ['index_manage'] }
+      }
     ]
   }
   ,

hb_client/src/views/sam/order.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div>
+      <el-input
+              v-model="listQuery.search"
+              placeholder="订单名称"
+              style="width: 300px"
+              class="filter-item"
+              @keyup.enter.native="handleFilter"
+            />
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-refresh-left"
+              @click="resetFilter"
+              >重置</el-button
+            >
+    </div>
+    <div style="margin-top: 10px">
+      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增订单</el-button
+      >
+    </div>
+    </el-card>
+    <el-card style="margin-top: 10px">
+      <el-table
+        v-loading="listLoading"
+        :data="orderList.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="600"
+      >
+        <el-table-column type="index" width="50" />
+        
+        <el-table-column label="订单编号">
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+         <el-table-column label="客户">
+          <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
+        </el-table-column>
+          <el-table-column label="所属合同">
+          <template slot-scope="scope">{{ scope.row.contract_.name }}</template>
+        </el-table-column>
+         <el-table-column label="所需产品">
+          <template slot-scope="scope">{{ scope.row.product_.name }}</template>
+        </el-table-column>
+       <el-table-column label="所需数量">
+          <template slot-scope="scope">{{ scope.row.count }}</template>
+        </el-table-column>
+         <el-table-column label="交货日期">
+          <template slot-scope="scope">{{ scope.row.delivery_date }}</template>
+        </el-table-column>
+  <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
+        <el-table-column
+          align="center"
+          label="操作"
+          width="220px"
+        >
+          <template slot-scope="scope">
+           
+            <el-link
+              v-if="checkPermission(['warehouse_update'])"
+              @click="handleEdit(scope)"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="checkPermission(['warehouse_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="orderList.count > 0"
+        :total="orderList.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogType === 'edit' ? '编辑订单' : '新增订单'"
+    >
+      <el-form
+        ref="Form"
+        :model="order"
+        label-width="80px"
+        label-position="right"
+        :rules="rule1"
+      >
+       
+        <el-form-item label="订单编号" prop="number">
+          <el-input v-model="order.number" placeholder="订单编号" />
+        </el-form-item>
+          <el-form-item label="所需产品" prop="product">
+         <el-select  style="width: 100%" v-model="order.product" placeholder="请选择">
+             <el-option
+                v-for="item in productoptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+          </el-form-item>
+        <el-form-item label="所需数量" prop="count">
+           <el-input type="number" v-model="order.count"></el-input>
+        </el-form-item>
+         <el-form-item label="交货日期" prop="delivery_date">
+           <el-date-picker
+            v-model="order.delivery_date"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          >
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="客户" prop="customer">
+         <el-select  style="width: 100%" v-model="order.customer" placeholder="请选择">
+             <el-option
+                v-for="item in customeroptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+          </el-form-item>
+         <el-form-item label="所属合同" prop="contract">
+         <el-select  style="width: 100%" v-model="order.contract" placeholder="请选择">
+             <el-option
+                v-for="item in contractoptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+          </el-form-item>
+         
+        
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getOrderList, createOrder,updateOrder,deleteOrder,getContractList,getCustomerList } from "@/api/sam";
+import { getMaterialList } from "@/api/mtm";
+import checkPermission from "@/utils/permission";
+
+
+import { genTree } from "@/utils";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+const defaulteorder = {
+};
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      order: defaulteorder,
+      orderList: {
+        count: 0,
+      },
+      listQuery: {
+        page: 1,
+        page_size: 20,
+      },
+    contractoptions:[],
+    productoptions:[],
+    customeroptions:[],
+      listLoading: true,
+      dialogVisible: false,
+      dialogType: "new",
+      rule1: {
+        number: [{ required: true, message: "请输入", trigger: "blur" }],
+        customer: [{ required: true, message: "请输入", trigger: "blur" }],
+        product: [{ required: true, message: "请输入", trigger: "blur" }],
+        delivery_date: [{ required: true, message: "请输入", trigger: "blur" }],
+      },
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+     this.getListm();
+     this.getListc();
+    this.getListcm();
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+  
+    getList() {
+      this.listLoading = true;
+      getOrderList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.orderList = response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+   
+     getListm() {
+      
+      getMaterialList({pageoff:true,type:1}).then((response) => {
+        
+          this.productoptions = genTree(response.data);
+       
+      });
+    },
+     getListc() {
+      
+      getContractList({pageoff:true}).then((response) => {
+        
+          this.contractoptions = genTree(response.data);
+       
+      });
+    },
+     getListcm() {
+      
+      getCustomerList({pageoff:true}).then((response) => {
+        
+          this.customeroptions = genTree(response.data);
+       
+      });
+    },
+   
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      }
+      this.getList();
+    },
+    handleCreate() {
+      this.order = Object.assign({}, defaulteorder);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+   
+    handleEdit(scope) {
+      this.order = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleteOrder(scope.row.id);
+          this.getList();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+   
+    async confirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            updateOrder(this.order.id, this.order).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            createOrder(this.order).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                 this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>

hb_server/apps/em/migrations/0008_auto_20210916_1054.py

@@ -0,0 +1,32 @@
+# Generated by Django 3.2.6 on 2021-09-16 02:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('em', '0007_equipmentrecord'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='equipmentrecord',
+            name='nextdate',
+        ),
+        migrations.AddField(
+            model_name='equipment',
+            name='nextdate',
+            field=models.DateField(blank=True, null=True, verbose_name='下次应校准或检定日期'),
+        ),
+        migrations.AddField(
+            model_name='equipment',
+            name='recentlydate',
+            field=models.DateField(blank=True, null=True, verbose_name='最近一次校准/检定日期'),
+        ),
+        migrations.AlterField(
+            model_name='equipmentrecord',
+            name='recentlydate',
+            field=models.DateField(blank=True, null=True, verbose_name='校准/检定日期'),
+        ),
+    ]

hb_server/apps/em/migrations/0009_auto_20210916_1108.py

@@ -0,0 +1,31 @@
+# Generated by Django 3.2.6 on 2021-09-16 03:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('em', '0008_auto_20210916_1054'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='equipment',
+            name='nextdate',
+        ),
+        migrations.RemoveField(
+            model_name='equipment',
+            name='recentlydate',
+        ),
+        migrations.AddField(
+            model_name='equipmentrecord',
+            name='nextdate',
+            field=models.DateField(blank=True, null=True, verbose_name='下次应校准或检定日期'),
+        ),
+        migrations.AlterField(
+            model_name='equipmentrecord',
+            name='recentlydate',
+            field=models.DateField(blank=True, null=True, verbose_name='最近一次校准/检定日期'),
+        ),
+    ]

hb_server/apps/em/views.py

@@ -26,7 +26,7 @@ class EquipmentViewSet(CreateUpdateModelAMixin, OptimizationMixin, ModelViewSet)
 # Create your views here.
 class EquipmentrecordViewSet(CreateUpdateModelAMixin, OptimizationMixin, ModelViewSet):
     """
-    设备台账-增删改查
+    设备校准-增删改查
     """
     perms_map = {'get': '*', 'post': 'equipmentrecord_create',
                  'put': 'equipmentrecord_update', 'delete': 'equipmentrecord_delete'}

hb_server/apps/qm/migrations/0002_alter_analysisitem_rules.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.6 on 2021-09-16 02:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('qm', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='analysisitem',
+            name='rules',
+            field=models.JSONField(default=list, verbose_name='判定规则'),
+        ),
+    ]

hb_server/apps/sam/serializers.py

@@ -2,6 +2,8 @@ from rest_framework import serializers
 
 from .models import Contract, Customer, Order
 
+from apps.mtm.serializers import MaterialSimpleSerializer
+
 class CustomerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Customer
@@ -42,6 +44,7 @@ class OrderCreateUpdateSerializer(serializers.ModelSerializer):
 class OrderSerializer(serializers.ModelSerializer):
     contract_ =  ContractSimpleSerializer(source='contract', read_only=True)
     customer_  = CustomerSimpleSerializer(source='customer', read_only=True)
+    product_  = MaterialSimpleSerializer(source='product', read_only=True)
     class Meta:
         model = Order
         fields = '__all__'

hb_server/apps/sam/urls.py

@@ -1,12 +1,13 @@
 from django.db.models import base
 from rest_framework import urlpatterns
-from apps.sam.views import CustomerViewSet,ContractViewSet
+from apps.sam.views import CustomerViewSet,ContractViewSet,OrderViewSet
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
 router.register('customer', CustomerViewSet, basename='customer')
 router.register('contract', ContractViewSet, basename='contract')
+router.register('order', OrderViewSet, basename='order')
 
 urlpatterns = [
     path('', include(router.urls)),