From aec826efc678ca0f32282c26e3f65e9d60945069 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Wed, 22 Sep 2021 13:58:32 +0800
Subject: [PATCH] tijiaozigongxu

---
 hb_client/package.json               |   2 +-
 hb_client/src/router/index.js        |   7 +
 hb_client/src/views/mtm/step.vue     |   4 +-
 hb_client/src/views/sam/contract.vue |   6 +-
 hb_client/src/views/sam/order.vue    |   4 +
 hb_client/src/views/sam/review.vue   | 284 +++++++++++++++++++++++++++
 hb_server/apps/mtm/serializers.py    |   2 +-
 7 files changed, 304 insertions(+), 5 deletions(-)
 create mode 100644 hb_client/src/views/sam/review.vue

diff --git a/hb_client/package.json b/hb_client/package.json
index d8201b2..0a17f55 100644
--- a/hb_client/package.json
+++ b/hb_client/package.json
@@ -20,7 +20,7 @@
     "axios": "^0.21.1",
     "cache-loader": "^4.1.0",
     "compression-webpack-plugin": "^5.0.1",
-    "d3": "^5.16.0",
+    "d3": "^5.14.2",
     "dagre-d3": "^0.6.4",
     "element-ui": "^2.15.5",
     "file-saver": "^2.0.2",
diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 87508ea..9685b0e 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -176,6 +176,13 @@ export const asyncRoutes = [
         meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
       }
       ,
+      {
+        path: 'review',
+        name: 'review',
+        component: () => import('@/views/sam/review'),
+        meta: { title: '合同评审', icon: 'example', perms: ['index_manage'] }
+      }
+      ,
       {
         path: 'order',
         name: 'order',
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index d614d5d..48f3c4d 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -6,7 +6,7 @@
     font-weight: 700;
 ">子工序列表</span>
       </div>
-      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+      <el-button type="primary" icon="el-icon-plus" @click="handleCreateStep"
       >新增子工序</el-button>
       <el-table
         v-loading="listLoading"
@@ -109,7 +109,7 @@
           font-weight: 700;
           ">过程记录表</span>
             </div>
-            <el-button type="primary" icon="el-icon-plus" @click="handleCreateStep"
+            <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
             >新增</el-button>
             <el-table
               :data="recordformList.results"
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index 254bfad..abd14b4 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -48,9 +48,13 @@
         <el-table-column label="合同编号">
           <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="合同金额">
+         <el-table-column label="合同金额（元）">
           <template slot-scope="scope">{{ scope.row.amount }}</template>
         </el-table-column>
+         <el-table-column label="开票金额（元）">
+          <template slot-scope="scope">{{ scope.row.invoice }}</template>
+        </el-table-column>
+        
           <el-table-column label="客户名称">
           <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
         </el-table-column>
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index a316672..79e731b 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -53,6 +53,9 @@
         </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.product_.specification }}</template>
         </el-table-column>
        <el-table-column label="所需数量">
           <template slot-scope="scope">{{ scope.row.count }}</template>
@@ -117,6 +120,7 @@
               </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>
diff --git a/hb_client/src/views/sam/review.vue b/hb_client/src/views/sam/review.vue
new file mode 100644
index 0000000..abd14b4
--- /dev/null
+++ b/hb_client/src/views/sam/review.vue
@@ -0,0 +1,284 @@
+<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="contractList.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.name }}</template>
+        </el-table-column>
+       
+        <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.amount }}</template>
+        </el-table-column>
+         <el-table-column label="开票金额（元）">
+          <template slot-scope="scope">{{ scope.row.invoice }}</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.sign_date }}</template>
+        </el-table-column>
+       <el-table-column label="描述">
+          <template slot-scope="scope">{{ scope.row.description }}</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="contractList.count > 0"
+        :total="contractList.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="contract"
+        label-width="80px"
+        label-position="right"
+        :rules="rule1"
+      >
+        <el-form-item label="合同名称" prop="name">
+          <el-input v-model="contract.name" placeholder="合同名称" />
+        </el-form-item>
+        <el-form-item label="合同编号" prop="number">
+          <el-input v-model="contract.number" placeholder="合同编号" />
+        </el-form-item>
+         <el-form-item label="合同金额" prop="amount">
+          <el-input v-model="contract.amount" placeholder="合同金额" />
+        </el-form-item>
+        <el-form-item label="开票金额" prop="invoice">
+          <el-input v-model="contract.invoice" placeholder="开票金额" />
+        </el-form-item>
+         <el-form-item label="签订日期" prop="sign_date">
+           <el-date-picker
+            v-model="contract.sign_date"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          >
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="客户" prop="sign_date">
+         <el-select  style="width: 100%" v-model="contract.customer" placeholder="请选择">
+             <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+          </el-form-item>
+         <el-form-item label="描述" prop="description">
+          <el-input v-model="contract.description" placeholder="描述" />
+        </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 { getContractList, createContract,updateContract,deleteContract,getCustomerList } from "@/api/sam";
+import checkPermission from "@/utils/permission";
+
+
+import { genTree } from "@/utils";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+const defaultecontract = {
+};
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      contract: defaultecontract,
+     contractList: {
+        count: 0,
+      },
+      listQuery: {
+        page: 1,
+        page_size: 20,
+      },
+     options:[],
+      listLoading: true,
+      dialogVisible: false,
+      dialogType: "new",
+      rule1: {
+        name: [{ required: true, message: "请输入", trigger: "blur" }],
+      },
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+     this.getLists();
+    this.getList();
+  },
+  methods: {
+    checkPermission,
+  
+    getList() {
+      this.listLoading = true;
+      getContractList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.contractList = response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+   
+     getLists() {
+      
+      getCustomerList({pageoff:true}).then((response) => {
+        
+          this.options = genTree(response.data);
+       
+      });
+    },
+   
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      }
+      this.getList();
+    },
+    handleCreate() {
+      this.contract = Object.assign({}, defaultecontract);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+   
+    handleEdit(scope) {
+      this.contract = 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 deleteContract(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) {
+            updateContract(this.contract.id, this.contract).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            createContract(this.contract).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                 this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>
diff --git a/hb_server/apps/mtm/serializers.py b/hb_server/apps/mtm/serializers.py
index 68b214b..004d3d3 100644
--- a/hb_server/apps/mtm/serializers.py
+++ b/hb_server/apps/mtm/serializers.py
@@ -25,7 +25,7 @@ class MaterialDetailSerializer(serializers.ModelSerializer):
 class MaterialSimpleSerializer(serializers.ModelSerializer):
     class Meta:
         model = Material
-        fields = ['id', 'name', 'number', 'unit']
+        fields = ['id', 'name', 'number', 'unit','specification']
 
 class ProcessSerializer(serializers.ModelSerializer):
     instruction_ = FileSimpleSerializer(source='instruction', read_only=True)