优化

manager-admin/src/views/dashboard/index.vue

@@ -8,6 +8,12 @@
     <el-divider></el-divider>
     <el-card>
       <div>
+        <b>20241225-wnn</b>
+        <p>- 生产备注可以叠加</p>
+        <p>- 2、订单增加一个订单复制功能，方便销售填写增量订单和代理商复购订单；</p>
+        <p>- 2、订单增加一个订单复制功能，方便销售填写增量订单和代理商复购订单；</p>
+        <p>- 3、订单详情中的服务相关增加信息科联系人、护理部联系人、设备科联系人、授权计划备注；</p>
+        <p>- 4、产品维护增加产品类型字段，选择：外购、自产、系统；同时订单中需要显示产品类型；</p>
         <b>20241224-wnn</b>
         <p>- 技术也能上传图片</p>
         <p>- 项目产品列表增加已发货数量、生产备注显示</p>

manager-admin/src/views/goods/goodsDetail.vue

@@ -9,7 +9,7 @@
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          产品类型
+          服务器类型
         </template>
         {{goodsForm.type}}
       </el-descriptions-item>
@@ -19,7 +19,12 @@
         </template>
         {{goodsForm.type_base ? '是' : '不是'}}
       </el-descriptions-item>
-
+      <el-descriptions-item>
+        <template slot="label">
+          类型
+        </template>
+        {{ goodsForm.good_type }}
+      </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
           生产型号

manager-admin/src/views/goods/goodsEdit.vue

@@ -10,7 +10,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="产品类型" prop="type">
+            <el-form-item label="服务器类型" prop="type">
               <el-select v-model="goodsForm.type" placeholder="请选择" multiple size="medium" clearable>
                 <el-option label="风尚版" value="风尚版"/>
                 <el-option label="服务器版" value="服务器版"/>
@@ -76,6 +76,20 @@
           </el-col>
         </el-row>
 
+
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="设备类型" prop="good_type">
+              <el-select v-model="goodsForm.good_type" clearable filterable allow-create
+                         placeholder="选择设备类型">
+                <el-option value="外购"></el-option>
+                <el-option value="自产"></el-option>
+                <el-option value="系统"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
         <el-form-item label="产品图片：" ref="gallery" prop="gallery" style="width: 90%;text-align: left;">
           <el-upload
             :action="`${MixinUploadApi}?scene=pjgoods`"

manager-admin/src/views/goods/goodsList.vue

@@ -61,6 +61,7 @@
       </el-table-column>
       <el-table-column label="生产型号" prop="code"></el-table-column>
       <el-table-column label="产品编码" prop="no"></el-table-column>
+      <el-table-column label="类型" prop="good_type"></el-table-column>
       <el-table-column label="库存" prop="store_qty" width="100"></el-table-column>
       <el-table-column label="生产周期" prop="produce_day" width="100"></el-table-column>
       <el-table-column label="建议价格" width="150">

manager-admin/src/views/goods/goodsListView.vue

@@ -52,6 +52,7 @@
       <el-table-column label="产品编码" prop="no"></el-table-column>
       <el-table-column label="库存" prop="store_qty"></el-table-column>
       <el-table-column label="生产周期" prop="produce_day"></el-table-column>
+      <el-table-column label="类型" prop="good_type"></el-table-column>
       <el-table-column label="建议价格" width="150">
         <template slot-scope="scope">
           <span v-if="scope.row.price_advise">{{ scope.row.price_advise | unitPrice('￥') }}</span>

manager-admin/src/views/goods/goodsSelect.vue

@@ -49,6 +49,7 @@
       </el-table-column>
       <el-table-column label="生产型号" prop="code"></el-table-column>
       <el-table-column label="产品编码" prop="no"></el-table-column>
+      <el-table-column label="类型" prop="good_type"></el-table-column>
       <el-table-column label="库存" prop="store_qty" width="100"></el-table-column>
       <el-table-column label="生产周期" prop="produce_day" width="100"></el-table-column>
       <el-table-column label="建议价格" width="150">

manager-admin/src/views/pjOrder/Edit.vue

@@ -35,6 +35,9 @@
       </el-descriptions-item>
     </el-descriptions>
     <el-button v-if="userList.length > 0" :disabled="checkList.length === 0" type="primary" style="margin: 10px;" @click="handleSendEmail">邮件通知</el-button>
+    <el-tooltip class="item" effect="dark" content="方便销售填写增量订单和代理商复购订单" placement="top">
+      <el-button type="success" style="margin: 10px;" @click="handleReset">订单复制</el-button>
+    </el-tooltip>
     <el-steps :active="2" finish-status="error" simple v-if="modelForm.status === 6">
       <el-step title="创建定单" status="success"></el-step>
       <el-step title="已作废"></el-step>
@@ -143,54 +146,130 @@
       </el-tab-pane>
       <el-tab-pane label="服务相关" v-if="boolFounder || permissions.filter(p => p === 'pjTech').length > 0">
         <el-form :model="modelForm" :rules="serverFormRule" label-width="100px" ref="serverForm">
-          <el-form-item label="网络类型" prop="net_mode">
-            <el-select v-model="modelForm.net_mode" placeholder="请选择" @change="netModelChange" clearable>
-              <el-option label="独立局域网" value="独立局域网"/>
-              <el-option label="非独立局域网" value="非独立局域网"/>
-              <el-option label="公网" value="公网"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="授权码" prop="auth_base">
-            <el-input v-model="modelForm.auth_base" :maxlength="50"></el-input>
-          </el-form-item>
-          <el-form-item label="授权序列号" prop="auth_code">
-            <el-input v-model="modelForm.auth_code" type="textarea"
-                      :autosize="{ minRows: 2, maxRows: 6}"
-                      :minlength="50"></el-input>
-          </el-form-item>
-          <el-form-item label="授权过期日" prop="auth_expires">
-            <el-input v-model="modelForm.auth_expires" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="pve_ip" prop="pve_ip">
-            <el-input v-model="modelForm.pve_ip" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="pve_user" prop="pve_user">
-            <el-input v-model="modelForm.pve_user" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="pve_pwd" prop="pve_pwd">
-            <el-input v-model="modelForm.pve_pwd" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="route_ip" prop="route_ip">
-            <el-input v-model="modelForm.route_ip" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="route_ip2" prop="route_ip2">
-            <el-input v-model="modelForm.route_ip2" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="route_user" prop="route_user">
-            <el-input v-model="modelForm.route_user" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="route_pwd" prop="route_pwd">
-            <el-input v-model="modelForm.route_pwd" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="linux_ip" prop="linux_ip">
-            <el-input v-model="modelForm.linux_ip" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="linux_ip2" prop="linux_ip2">
-            <el-input v-model="modelForm.linux_ip2" :maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="linux_user" prop="linux_user">
-            <el-input v-model="modelForm.linux_user" :maxlength="20"></el-input>
-          </el-form-item>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="网络类型" prop="net_mode">
+                <el-select v-model="modelForm.net_mode" placeholder="请选择" @change="netModelChange" clearable>
+                  <el-option label="独立局域网" value="独立局域网"/>
+                  <el-option label="非独立局域网" value="非独立局域网"/>
+                  <el-option label="公网" value="公网"/>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="信息科联系人" prop="info_contacts">
+                <el-input v-model="modelForm.info_contacts" placeholder="请输入信息科联系人及电话" :maxlength="50"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="护理部联系人" prop="nurse_contacts">
+                <el-input v-model="modelForm.nurse_contacts" placeholder="请输入护理部联系人及电话" :maxlength="50"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="设备科联系人" prop="device_contacts">
+                <el-input v-model="modelForm.device_contacts" placeholder="请输入设备科联系人及电话" :maxlength="50"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="授权码" prop="auth_base">
+                <el-input v-model="modelForm.auth_base" :maxlength="50"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="授权过期日" prop="auth_expires">
+                <el-input v-model="modelForm.auth_expires" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="授权序列号" prop="auth_code">
+                <el-input v-model="modelForm.auth_code" type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 6}"
+                          :minlength="50"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="授权计划备注" prop="auth_remark">
+                <el-input v-model="modelForm.auth_remark" type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 6}"
+                          :minlength="150"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="pve_ip" prop="pve_ip">
+                <el-input v-model="modelForm.pve_ip" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="pve_user" prop="pve_user">
+                <el-input v-model="modelForm.pve_user" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="pve_pwd" prop="pve_pwd">
+                <el-input v-model="modelForm.pve_pwd" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="route_ip" prop="route_ip">
+                <el-input v-model="modelForm.route_ip" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="route_ip2" prop="route_ip2">
+                <el-input v-model="modelForm.route_ip2" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="route_user" prop="route_user">
+                <el-input v-model="modelForm.route_user" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="route_pwd" prop="route_pwd">
+                <el-input v-model="modelForm.route_pwd" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="linux_ip" prop="linux_ip">
+                <el-input v-model="modelForm.linux_ip" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="linux_ip2" prop="linux_ip2">
+                <el-input v-model="modelForm.linux_ip2" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="linux_user" prop="linux_user">
+                <el-input v-model="modelForm.linux_user" :maxlength="20"></el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-form-item label="linux_pwd" prop="linux_pwd">
             <el-input v-model="modelForm.linux_pwd" :maxlength="20"></el-input>
           </el-form-item>
@@ -466,6 +545,16 @@ export default {
           this.modelForm.linux_user = 'root'
           this.modelForm.linux_pwd = '123qwe,.'
         }
+      } else {
+        this.modelForm.pve_ip = ''
+        this.modelForm.pve_user = ''
+        this.modelForm.pve_pwd = ''
+        this.modelForm.route_ip = ''
+        this.modelForm.route_user = ''
+        this.modelForm.route_pwd = ''
+        this.modelForm.linux_ip = ''
+        this.modelForm.linux_user = ''
+        this.modelForm.linux_pwd = ''
       }
     },
     handleTech() {

manager-admin/src/views/pjOrder/ItemDetail.vue

@@ -22,7 +22,7 @@
       </el-descriptions-item>
       <el-descriptions-item>
         <template slot="label">
-          产品类型
+          服务器类型
         </template>
         <span>{{modelForm.type}}</span>
       </el-descriptions-item>

manager-admin/src/views/pjOrder/Items.vue

@@ -57,6 +57,7 @@
               <el-button round size="mini" @click="gotoGoods(scope.row.good_id)">{{ scope.row.no }}</el-button>
             </template>
           </el-table-column>
+          <el-table-column prop="good_type" label="类型" width="100"></el-table-column>
           <el-table-column v-if="params.type === '2'" label="总需数量" prop="count1"></el-table-column>
           <el-table-column v-if="params.type === '2'" label="已产数量" prop="count2"></el-table-column>
           <el-table-column v-if="params.type === '2'" label="需产数量">

manager-admin/src/views/pjOrder/OrderItems.vue

@@ -24,6 +24,7 @@
                   <div class="info">
                     <div>生产型号：{{ item.code }}</div>
                     <div>产品编码：{{ item.no }}</div>
+                    <div>类型：{{ item.good_type }}</div>
                     <div>生产周期：{{ item.produce_day }}天</div>
                     <div>数量：{{item.qty}}</div>
                     <div>价格：{{item.price}}</div>
@@ -334,6 +335,7 @@
           <el-table-column prop="no" show-overflow-tooltip label="生产编码"></el-table-column>
           <el-table-column prop="hard_ver" show-overflow-tooltip label="硬件版本"></el-table-column>
           <el-table-column prop="soft_ver" show-overflow-tooltip label="软件版本"></el-table-column>
+          <el-table-column prop="good_type" label="类型" width="100"></el-table-column>
           <el-table-column prop="qty" label="数量" width="100"></el-table-column>
           <el-table-column prop="produced_qty" label="已产数量" width="100"></el-table-column>
           <el-table-column prop="produced_qty" label="需产数量" width="100">
@@ -480,6 +482,7 @@ export default {
           '生产编码': item.no,
           '硬件版本': item.hard_ver,
           '软件编码': item.soft_ver,
+          '产品类型': item.good_type,
           '数量': item.qty,
           '已产数量': item.produced_qty,
           '需产数量': item.qty - item.produced_qty,